From 6226526b59304184525de98b99d80c2739bfc412 Mon Sep 17 00:00:00 2001 From: eelliott Date: Tue, 5 Dec 2023 16:28:21 -0500 Subject: [PATCH] GPA 3.15 updates --- BUILD.md | 2 +- CMakeLists.txt | 4 +- LICENSE => LICENSE.txt | 0 NOTICES.txt | 2 +- README.md | 23 +- ReleaseNotes.md => RELEASE_NOTES.txt | 10 + build/cmake_modules/android.cmake | 4 +- build/cmake_modules/build_flags.cmake | 2 +- build/cmake_modules/clang_utils.cmake | 4 +- build/cmake_modules/defs.cmake | 2 +- build/cmake_modules/gpa_version.cmake | 2 +- build/cmake_modules/gpa_vulkan.cmake | 4 +- build/cmake_modules/targets.cmake | 4 +- build/cmake_modules/utils.cmake | 4 +- .../cmake_modules/win_resource_compile.cmake | 6 +- docs/doxygen/DoxyfilePublic | 2 +- docs/sphinx/CMakeLists.txt | 2 +- docs/sphinx/source/conf.py | 6 +- .../source/graphics_counter_tables_gfx103.rst | 2 +- .../source/graphics_counter_tables_gfx11.rst | 2 +- .../gpu_perf_api_counters.h | 9 +- .../gpu_perf_api_function_types.h | 2 +- scripts/dependencies_map.py | 4 +- scripts/gpa_packaging.py | 2 +- .../gpa_hw_counter.cmake | 2 +- .../gpa_hw_counter_cl.cmake | 2 +- .../gpa_hw_counter_cl_gfx10.cc | 195 ++- .../gpa_hw_counter_cl_gfx10.h | 1 - .../gpa_hw_counter_cl_gfx103.cc | 225 ++- .../gpa_hw_counter_cl_gfx103.h | 1 - .../gpa_hw_counter_cl_gfx11.cc | 227 ++- .../gpa_hw_counter_cl_gfx11.h | 1 - .../gpa_hw_counter_cl_gfx8.cc | 141 +- .../gpa_hw_counter_cl_gfx8.h | 1 - .../gpa_hw_counter_cl_gfx9.cc | 207 ++- .../gpa_hw_counter_cl_gfx9.h | 1 - .../gpa_hw_counter_dx11.cmake | 2 +- .../gpa_hw_counter_dx11_gfx10.cc | 413 +++-- .../gpa_hw_counter_dx11_gfx10.h | 1 - .../gpa_hw_counter_dx11_gfx103.cc | 817 +++++---- .../gpa_hw_counter_dx11_gfx103.h | 1 - .../gpa_hw_counter_dx11_gfx11.cc | 1521 ++++++++--------- .../gpa_hw_counter_dx11_gfx11.h | 1 - .../gpa_hw_counter_dx11_gfx8.cc | 461 +++-- .../gpa_hw_counter_dx11_gfx8.h | 1 - .../gpa_hw_counter_dx11_gfx9.cc | 527 +++--- .../gpa_hw_counter_dx11_gfx9.h | 1 - .../gpa_hw_counter_dx12.cmake | 2 +- .../gpa_hw_counter_dx12_gfx10.cc | 413 +++-- .../gpa_hw_counter_dx12_gfx10.h | 1 - .../gpa_hw_counter_dx12_gfx103.cc | 817 +++++---- .../gpa_hw_counter_dx12_gfx103.h | 1 - .../gpa_hw_counter_dx12_gfx11.cc | 1521 ++++++++--------- .../gpa_hw_counter_dx12_gfx11.h | 1 - .../gpa_hw_counter_dx12_gfx8.cc | 461 +++-- .../gpa_hw_counter_dx12_gfx8.h | 1 - .../gpa_hw_counter_dx12_gfx9.cc | 527 +++--- .../gpa_hw_counter_dx12_gfx9.h | 1 - .../gpa_hw_counter_gl.cmake | 2 +- .../gpa_hw_counter_gl_gfx10.cc | 149 +- .../gpa_hw_counter_gl_gfx10.h | 1 - .../gpa_hw_counter_gl_gfx103.cc | 183 +- .../gpa_hw_counter_gl_gfx103.h | 1 - .../gpa_hw_counter_gl_gfx8.cc | 143 +- .../gpa_hw_counter_gl_gfx8.h | 1 - .../gpa_hw_counter_gl_gfx9.cc | 145 +- .../gpa_hw_counter_gl_gfx9.h | 1 - .../gpa_hw_counter_oglp_gfx10.cc | 413 +++-- .../gpa_hw_counter_oglp_gfx10.h | 1 - .../gpa_hw_counter_oglp_gfx103.cc | 817 +++++---- .../gpa_hw_counter_oglp_gfx103.h | 1 - .../gpa_hw_counter_oglp_gfx11.cc | 1521 ++++++++--------- .../gpa_hw_counter_oglp_gfx11.h | 1 - .../gpa_hw_counter_oglp_gfx8.cc | 461 +++-- .../gpa_hw_counter_oglp_gfx8.h | 1 - .../gpa_hw_counter_oglp_gfx9.cc | 527 +++--- .../gpa_hw_counter_oglp_gfx9.h | 1 - .../gpa_hw_counter_vk.cmake | 2 +- .../gpa_hw_counter_vk_gfx10.cc | 413 +++-- .../gpa_hw_counter_vk_gfx10.h | 1 - .../gpa_hw_counter_vk_gfx103.cc | 817 +++++---- .../gpa_hw_counter_vk_gfx103.h | 1 - .../gpa_hw_counter_vk_gfx11.cc | 1521 ++++++++--------- .../gpa_hw_counter_vk_gfx11.h | 1 - .../gpa_hw_counter_vk_gfx8.cc | 461 +++-- .../gpa_hw_counter_vk_gfx8.h | 1 - .../gpa_hw_counter_vk_gfx9.cc | 527 +++--- .../gpa_hw_counter_vk_gfx9.h | 1 - .../public_counter_definitions_cl.cmake | 2 +- .../public_counter_definitions_dx11.cmake | 2 +- .../public_counter_definitions_dx12.cmake | 2 +- .../public_counter_definitions_dx12_gfx103.cc | 4 +- .../public_counter_definitions_dx12_gfx11.cc | 4 +- .../public_counter_definitions_gl.cmake | 2 +- .../public_counter_definitions_gl_gfx10.cc | 2 +- .../public_counter_definitions_gl_gfx103.cc | 2 +- .../public_counter_definitions_gl_gfx8.cc | 2 +- .../public_counter_definitions_gl_gfx9.cc | 2 +- .../public_counter_definitions_oglp_gfx11.cc | 2 +- .../public_counter_definitions_vk.cmake | 2 +- .../public_counter_definitions_vk_gfx103.cc | 2 +- .../public_counter_definitions_vk_gfx11.cc | 2 +- .../counters/public_derived_counters_cl.cmake | 2 +- .../public_derived_counters_dx11.cmake | 2 +- .../public_derived_counters_dx12.cmake | 2 +- .../public_derived_counters_dx12_gfx103.cc | 2 +- .../public_derived_counters_dx12_gfx11.cc | 2 +- .../counters/public_derived_counters_gl.cmake | 2 +- .../public_derived_counters_gl_gfx10.cc | 2 +- .../public_derived_counters_gl_gfx103.cc | 2 +- .../public_derived_counters_gl_gfx8.cc | 2 +- .../public_derived_counters_gl_gfx9.cc | 2 +- .../public_derived_counters_oglp_gfx11.cc | 2 +- .../counters/public_derived_counters_vk.cmake | 2 +- .../public_derived_counters_vk_gfx103.cc | 2 +- .../public_derived_counters_vk_gfx11.cc | 2 +- .../public_counter_names_cl.cmake | 2 +- .../public_counter_names_dx11.cmake | 2 +- .../public_counter_names_dx12.cmake | 2 +- .../public_counter_names_gl.cmake | 2 +- .../public_counter_names_vk.cmake | 2 +- .../dx11/dx11_triangle/CMakeLists.txt | 2 +- .../dx12/dx12_color_cube/CMakeLists.txt | 2 +- .../dx12/dx12_color_cube/cube_sample.cc | 21 +- .../opengl/gl_triangle/CMakeLists.txt | 2 +- .../vulkan/vk_color_cube/CMakeLists.txt | 2 +- .../vulkan/vk_color_cube/gpa_helper.cc | 49 +- source/google_test/CMakeLists.txt | 2 +- source/gpu_perf_api_cl/CMakeLists.txt | 2 +- source/gpu_perf_api_common/CMakeLists.txt | 4 +- source/gpu_perf_api_common/gpa_context.cc | 2 +- .../gpa_context_counter_mediator.cc | 4 +- .../gpa_context_counter_mediator.h | 3 +- source/gpu_perf_api_common/gpa_version.h | 2 +- source/gpu_perf_api_common/gpu_perf_api.cc | 2 +- ...ecated.inc => gpu_perf_api_deprecated.hpp} | 0 source/gpu_perf_api_common/logging.h | 2 +- .../CMakeLists.txt | 2 +- .../counter_generator_cl.cmake | 4 +- .../counter_generator_common.cmake | 4 +- .../counter_generator_dx11.cmake | 2 +- .../counter_generator_dx12.cmake | 2 +- .../counter_generator_gl.cmake | 4 +- .../counter_generator_vk.cmake | 2 +- .../gpa_counter.h | 1 - .../gpa_counter_generator.cc | 3 +- .../gpa_counter_generator.h | 4 +- .../gpa_counter_generator_base.cc | 34 +- .../gpa_counter_generator_base.h | 9 +- .../gpa_counter_generator_cl.cc | 45 +- .../gpa_counter_generator_cl.h | 3 - .../gpa_counter_generator_dx11.cc | 45 +- .../gpa_counter_generator_dx11.h | 5 +- .../gpa_counter_generator_dx11_base.cc | 4 - .../gpa_counter_generator_dx11_base.h | 2 - .../gpa_counter_generator_dx12.cc | 45 +- .../gpa_counter_generator_dx12.h | 5 +- .../gpa_counter_generator_dx12_base.cc | 4 - .../gpa_counter_generator_dx12_base.h | 2 - .../gpa_counter_generator_gl.cc | 77 +- .../gpa_counter_generator_gl.h | 3 - .../gpa_counter_generator_vk.cc | 45 +- .../gpa_counter_generator_vk.h | 5 +- .../gpa_counter_generator_vk_base.cc | 4 - .../gpa_counter_generator_vk_base.h | 2 - .../gpa_derived_counter.cc | 3 +- ....inc => gpa_derived_counter_evaluator.hpp} | 100 +- .../gpa_hardware_counters.h | 2 - source/gpu_perf_api_counters/CMakeLists.txt | 2 +- .../gpa_counter_context_handler.cc | 11 +- .../gpa_counter_context_handler.h | 7 +- .../gpu_perf_api_counters.cc | 11 +- source/gpu_perf_api_dx/CMakeLists.txt | 2 +- source/gpu_perf_api_dx11/CMakeLists.txt | 2 +- source/gpu_perf_api_dx12/CMakeLists.txt | 2 +- .../dx12_gpa_command_list.cc | 38 +- .../gpu_perf_api_dx12/dx12_gpa_command_list.h | 13 - source/gpu_perf_api_dx12/dx12_gpa_pass.cc | 193 +-- source/gpu_perf_api_dx12/dx12_gpa_pass.h | 39 +- .../dx12_gpa_sample_config.cc | 251 ++- .../dx12_gpa_sample_config.h | 43 +- source/gpu_perf_api_dx12/dx12_gpa_session.cc | 1 + source/gpu_perf_api_gl/CMakeLists.txt | 2 +- source/gpu_perf_api_gl/asic_info.cc | 18 +- source/gpu_perf_api_gl/asic_info.h | 4 +- source/gpu_perf_api_gl/gl_gpa_pass.cc | 10 +- source/gpu_perf_api_unit_tests/CMakeLists.txt | 9 +- .../api_error_tests.cc | 2 +- .../counter_generator_cl_tests.cc | 86 +- .../counter_generator_dx11_tests.cc | 122 +- .../counter_generator_dx12_tests.cc | 122 +- .../counter_generator_gl_tests.cc | 133 +- .../counter_generator_tests.cc | 340 ++-- .../counter_generator_tests.h | 71 +- .../counter_generator_vk_tests.cc | 620 ++++++- .../counter_scheduler_tests.cc | 109 +- source/gpu_perf_api_vk/CMakeLists.txt | 2 +- source/public_counter_compiler/CMakeLists.txt | 2 +- .../CounterDefCmakeGen.cs | 4 +- .../CMakeLists.txt | 2 +- .../public_counter_definitions_gfx10.txt | 2 +- .../public_counter_definitions_gfx103.txt | 4 +- .../public_counter_definitions_gfx11.txt | 2 +- .../public_counter_definitions_gfx8.txt | 2 +- .../public_counter_definitions_gfx9.txt | 2 +- .../AmdDxExt/Global-AmdDxExt.cmake | 2 +- .../AmdVkExt/Global-AmdVkExt.cmake | 4 +- .../CMakeModules/Global-Common.cmake | 4 +- .../CMakeModules/Global-Internal.cmake | 4 +- .../third_party/CMakeModules/Global-x64.cmake | 2 +- .../third_party/CMakeModules/Global-x86.cmake | 2 +- source/third_party/Vulkan/Global-Vulkan.cmake | 4 +- 212 files changed, 10013 insertions(+), 9653 deletions(-) rename LICENSE => LICENSE.txt (100%) rename ReleaseNotes.md => RELEASE_NOTES.txt (97%) rename source/gpu_perf_api_common/{gpu_perf_api_deprecated.inc => gpu_perf_api_deprecated.hpp} (100%) rename source/gpu_perf_api_counter_generator/{gpa_derived_counter_evaluator.inc => gpa_derived_counter_evaluator.hpp} (87%) diff --git a/BUILD.md b/BUILD.md index c33c0e60..04910122 100644 --- a/BUILD.md +++ b/BUILD.md @@ -64,7 +64,7 @@ this script everytime you pull new changes from GPA repository. * Desktop development with C++ * Within the Visual Studio Installer, the following individual components: * Windows 11 SDK (10.0.22621.0) - * MSVC v143 - VS 2022 C++ x74/x86 build tools (latest) + * MSVC v143 - VS 2022 C++ x64/x86 build tools (latest) * C++ CMake tools for Windows * C++ Clang Compiler for Windows (15.0.1) * .NET Framework 4.6.2-4.8.1 SDKs and targeting packs diff --git a/CMakeLists.txt b/CMakeLists.txt index e1388430..176c2734 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) set(DEPTH "./") diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/NOTICES.txt b/NOTICES.txt index 3b7be81e..1a229302 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -1,7 +1,7 @@ DO NOT TRANSLATE OR LOCALIZE -Third-Party Notices Report for GPUPerfAPI v3.14 +Third-Party Notices Report for GPUPerfAPI v3.15 diff --git a/README.md b/README.md index 8f008964..6b6da58e 100644 --- a/README.md +++ b/README.md @@ -31,21 +31,13 @@ Prebuilt binaries can be downloaded from the Releases page: https://github.com/G * Provides access to some raw hardware counters. See [Raw Hardware Counters](#raw-hardware-counters) for more information. ## What's New -### Version 3.14 (09/21/2023) -* Added support for AMD Radeon RX 7700 XT and AMD Radeon RX 7800 XT graphics cards. -* Added support for additional AMD Radeon 700M Series devices. -* Added counters back to Gfx9, Gfx10, Gfx103, and Gfx11 hardware generations. These restored counters are listed below by group: - * Timing: TessellatorBusy, TessellatorBusyCycles, VsGsBusy, VsGsBusyCycles, VsGsTime, PreTessellationBusy, PreTessellationBusyCycles, PreTessellationTime, PostTessellationBusy, PostTessellationBusyCycles, PostTessellationTime - * VertexGeometry: VsGsVerticesIn, VsGsPrimsIn, GSVerticesOut - * PreTessellation: PreTessVerticesIn - * PostTessellation: PostTessPrimsOut - * PrimitiveAssembly: PrimitivesIn - * TextureUnit: TexTriFilteringPct, TexTriFilteringCount, NoTexTriFilteringCount, TexVolFilteringPct, TexVolFilteringCount, NoTexVolFilteringCount -* New counters added: - * MemoryCache: L0TagConflictReadStalledCycles, L0TagConflictWriteStalledCycles, L0TagConflictAtomicStalledCycles -* Changed to Visual Studio 2022 as the default build environment on Windows (previously Visual Studio 2019). -* Added improved support for multi-GPU systems. -* Removed code related to software counters on non-AMD hardware. +### Version 3.15 (12/06/2023) +* Updated minimum CMake version to 3.10 from 3.05. +* Updated equation for MemUnitBusyCycles. +* Updated description of LocalVidMemBytes. +* Renamed *.inc files to .hpp files. +* Reduced size of static buffer when logging messages to avoid compiler warning. +* Fixed an issue on some variant hardware that would prevent enabling certain hardware counters when kGpaOpenContextExposeHardwareCountersBit was specified to GpaOpenContext() by always generating asic-specific counters. ## System Requirements * An AMD Radeon GPU or APU based on Graphics IP version 8 and newer. @@ -108,6 +100,7 @@ It was discovered that the improvements introduced in Vega, RDNA, and RDNA2 arch There are some counters that are returning unexpected results on specific hardware with certain APIs. * AMD Radeon RX 6700M, DX11: CSLDSBankConflict and CSLDSBankConflictCycles may consistently report as much as 30x higher than expected. * AMD Radeon RX 480, DX12: CulledPrims and PSPixelsOut may inconsistently report higher than expected. +* VsGsVerticesIn is incorrectly reporting zero when using Vulkan on Linux for some hardware. ### Counter Validation Errors in D3D12ColorCube Sample App Due to the extensive counter validation now being done in the D3D12ColorCube sample application, and some expected variation in nondeterministic counters across a wide range of systems, the sample app may report errors on some systems. Likewise, some counters are marked as known issues and we are investigating the underlying causes of the inconsistent results. diff --git a/ReleaseNotes.md b/RELEASE_NOTES.txt similarity index 97% rename from ReleaseNotes.md rename to RELEASE_NOTES.txt index 991bed86..91c28e82 100644 --- a/ReleaseNotes.md +++ b/RELEASE_NOTES.txt @@ -1,5 +1,15 @@ # GPU Performance API Release Notes --- +# Version 3.15 (12/06/2023) +* Updated minimum CMake version to 3.10 from 3.05. +* Updated equation for MemUnitBusyCycles. +* Updated description of LocalVidMemBytes. +* Renamed *.inc files to .hpp files. +* Reduced size of static buffer when logging messages to avoid compiler warning. +* Fixed an issue on some variant hardware that would prevent enabling certain hardware counters when kGpaOpenContextExposeHardwareCountersBit was specified to GpaOpenContext() by always generating asic-specific counters. +* Known Issues: + * VsGsVerticesIn is incorrectly reporting zero when using Vulkan on Linux for some hardware. + ## Version 3.14 (09/21/2023) * Added support for AMD Radeon RX 7700 XT and AMD Radeon RX 7800 XT graphics cards. * Added support for additional AMD Radeon 700M Series devices. diff --git a/build/cmake_modules/android.cmake b/build/cmake_modules/android.cmake index 650d6da7..168365ee 100644 --- a/build/cmake_modules/android.cmake +++ b/build/cmake_modules/android.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2019-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) if (NOT DEFINED ENV{ANDROID_SDK}) message(FATAL_ERROR "ANDROID_SDK is not defined") diff --git a/build/cmake_modules/build_flags.cmake b/build/cmake_modules/build_flags.cmake index 63a95102..87025801 100644 --- a/build/cmake_modules/build_flags.cmake +++ b/build/cmake_modules/build_flags.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) ## GPA has only Debug and Release set(CMAKE_CONFIGURATION_TYPES Debug Release) diff --git a/build/cmake_modules/clang_utils.cmake b/build/cmake_modules/clang_utils.cmake index 06b6ea55..80728857 100644 --- a/build/cmake_modules/clang_utils.cmake +++ b/build/cmake_modules/clang_utils.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) find_program(CLANG_FORMAT clang-format DOC "Clang format executable") find_program(CLANG_TIDY clang-tidy DOC "Clang tidy executable") diff --git a/build/cmake_modules/defs.cmake b/build/cmake_modules/defs.cmake index e2291eb9..0247849b 100644 --- a/build/cmake_modules/defs.cmake +++ b/build/cmake_modules/defs.cmake @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.19) ## Define the GPA version set(GPA_MAJOR_VERSION 3) -set(GPA_MINOR_VERSION 14) +set(GPA_MINOR_VERSION 15) set(GPA_UPDATE_VERSION 0) if(NOT DEFINED GPA_BUILD_NUMBER) diff --git a/build/cmake_modules/gpa_version.cmake b/build/cmake_modules/gpa_version.cmake index e079368c..d08b3aef 100644 --- a/build/cmake_modules/gpa_version.cmake +++ b/build/cmake_modules/gpa_version.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) include(${CMAKE_CURRENT_LIST_DIR}/defs.cmake) diff --git a/build/cmake_modules/gpa_vulkan.cmake b/build/cmake_modules/gpa_vulkan.cmake index 138dd4cf..c030d4ff 100644 --- a/build/cmake_modules/gpa_vulkan.cmake +++ b/build/cmake_modules/gpa_vulkan.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.7.2) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) if(${GPA_ALL_OPEN_SOURCE}) find_package(Vulkan REQUIRED) diff --git a/build/cmake_modules/targets.cmake b/build/cmake_modules/targets.cmake index 43d8c279..2a0c24c4 100644 --- a/build/cmake_modules/targets.cmake +++ b/build/cmake_modules/targets.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) ## GPA has only Debug and Release set(CMAKE_CONFIGURATION_TYPES Debug Release) diff --git a/build/cmake_modules/utils.cmake b/build/cmake_modules/utils.cmake index 569aa4ec..072c1c26 100644 --- a/build/cmake_modules/utils.cmake +++ b/build/cmake_modules/utils.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) include(${GPA_CMAKE_MODULES_DIR}/clang_utils.cmake) diff --git a/build/cmake_modules/win_resource_compile.cmake b/build/cmake_modules/win_resource_compile.cmake index 6b55f128..a6f98c54 100644 --- a/build/cmake_modules/win_resource_compile.cmake +++ b/build/cmake_modules/win_resource_compile.cmake @@ -1,13 +1,13 @@ ## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) if(WIN32) include(${CMAKE_COMMON_LIB_GLOBAL_EXT_WINDOWS_SDK}) - set(RESOURCE_COMPILER_COMMAND_ARG /I\"${WINDOWS_SDK_UM}\" /I\"${WINDOWS_SDK_SHARED}\" /I\"${GPA_SRC_COMMON}/\" /D AMDT_PROJECT_SUFFIX=\"${AMDTPlatformSuffix}$<$:-d>\" /D AMDT_PROJECT_SUFFIX_W=L\"-d\" /D \"_DEBUG\" /l\"0x0409\" /nologo /fo \"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INTDIR}/${RESOURCE_FILE_NAME}.res\" \"${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_FILE_NAME}.rc\") + set(RESOURCE_COMPILER_COMMAND_ARG /I\"${WINDOWS_SDK_UM}\" /I\"${WINDOWS_SDK_SHARED}\" /I\"${GPA_SRC_COMMON}/\" /D AMDT_PROJECT_SUFFIX=\"${AMDTPlatformSuffix}$<$:-d>\" /D AMDT_PROJECT_SUFFIX_W=L\"-d\" $<$:/D_DEBUG> /l\"0x0409\" /nologo /fo \"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INTDIR}/${RESOURCE_FILE_NAME}.res\" \"${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_FILE_NAME}.rc\") add_custom_command(TARGET ${GPA_PROJECT_NAME} PRE_LINK COMMAND rc ${RESOURCE_COMPILER_COMMAND_ARG} COMMENT "Compiling resource file ${RESOURCE_FILE_NAME}.rc") set_property(TARGET ${GPA_PROJECT_NAME} PROPERTY LINK_FLAGS \"${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_FILE_NAME}.res\") -endif() \ No newline at end of file +endif() diff --git a/docs/doxygen/DoxyfilePublic b/docs/doxygen/DoxyfilePublic index 849def68..2f61f3e8 100644 --- a/docs/doxygen/DoxyfilePublic +++ b/docs/doxygen/DoxyfilePublic @@ -31,7 +31,7 @@ PROJECT_NAME = "GPU Perf API" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.14 +PROJECT_NUMBER = 3.15 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/docs/sphinx/CMakeLists.txt b/docs/sphinx/CMakeLists.txt index d5af2faa..596c6551 100644 --- a/docs/sphinx/CMakeLists.txt +++ b/docs/sphinx/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../") diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py index af9def9d..411f11d4 100644 --- a/docs/sphinx/source/conf.py +++ b/docs/sphinx/source/conf.py @@ -61,16 +61,16 @@ # built documents. # # The short X.Y version. -version = u'3.14' +version = u'3.15' # The full version, including alpha/beta/rc tags. -release = u'3.14' +release = u'3.15' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/docs/sphinx/source/graphics_counter_tables_gfx103.rst b/docs/sphinx/source/graphics_counter_tables_gfx103.rst index 113790b1..6dff70b0 100644 --- a/docs/sphinx/source/graphics_counter_tables_gfx103.rst +++ b/docs/sphinx/source/graphics_counter_tables_gfx103.rst @@ -228,7 +228,7 @@ GlobalMemory Group "MemUnitStalledCycles", "Cycles", "Number of GPU cycles the memory unit is stalled." "WriteUnitStalled", "Percentage", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad)." "WriteUnitStalledCycles", "Cycles", "Number of GPU cycles the Write unit is stalled." - "LocalVidMemBytes", "Bytes", "Number of bytes read from or written to local video memory" + "LocalVidMemBytes", "Bytes", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory" "PcieBytes", "Bytes", "Number of bytes sent and received over the PCIe bus" RayTracing Group diff --git a/docs/sphinx/source/graphics_counter_tables_gfx11.rst b/docs/sphinx/source/graphics_counter_tables_gfx11.rst index 0e9f1987..85475bc5 100644 --- a/docs/sphinx/source/graphics_counter_tables_gfx11.rst +++ b/docs/sphinx/source/graphics_counter_tables_gfx11.rst @@ -223,7 +223,7 @@ GlobalMemory Group "MemUnitStalledCycles", "Cycles", "Number of GPU cycles the memory unit is stalled." "WriteUnitStalled", "Percentage", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad)." "WriteUnitStalledCycles", "Cycles", "Number of GPU cycles the Write unit is stalled." - "LocalVidMemBytes", "Bytes", "Number of bytes read from or written to local video memory" + "LocalVidMemBytes", "Bytes", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory" "PcieBytes", "Bytes", "Number of bytes sent and received over the PCIe bus" RayTracing Group diff --git a/include/gpu_performance_api/gpu_perf_api_counters.h b/include/gpu_performance_api/gpu_perf_api_counters.h index 41bd8fbc..31254fc4 100644 --- a/include/gpu_performance_api/gpu_perf_api_counters.h +++ b/include/gpu_performance_api/gpu_perf_api_counters.h @@ -241,15 +241,18 @@ typedef GpaStatus (*GpaCounterLibGetFuncTablePtrType)(void*); /// /// @param [in] api the api whose available counters are requested. /// @param [in] gpa_counter_context_hardware_info counter context hardware info. -/// @param [in] context_flags Flags used to initialize the context. Should be a combination of GPA_OpenContext_Bits. -/// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. +/// @param [in] context_flags Flags used to initialize the context. Should be a combination of GpaOpenContextBits. +/// @param [in] generate_asic_specific_counters_deprecated No longer supported, only acceptable value is 1 (true). /// @param [out] gpa_virtual_context Unique identifier of the opened virtual context. /// /// @return The GPA result status of the operation. kGpaStatusOk is returned if the operation is successful. +/// @retval kGpaStatusErrorNullPointer If the supplied gpa_virtual_context is a nullptr. +/// @retval kGpaStatusErrorInvalidParameter If any value other than 1 (true) is passed in for generate_asic_specific_counters_deprecated, +/// or if the context_flags specified would result in zero counters being exposed. GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibOpenCounterContext(GpaApiType api, GpaCounterContextHardwareInfo gpa_counter_context_hardware_info, GpaOpenContextFlags context_flags, - GpaUInt8 generate_asic_specific_counters, + GpaUInt8 generate_asic_specific_counters_deprecated, GpaCounterContext* gpa_virtual_context); /// typedef for GpaCounterLibOpenCounterContext function pointer. diff --git a/include/gpu_performance_api/gpu_perf_api_function_types.h b/include/gpu_performance_api/gpu_perf_api_function_types.h index 84fbe500..f757e89b 100644 --- a/include/gpu_performance_api/gpu_perf_api_function_types.h +++ b/include/gpu_performance_api/gpu_perf_api_function_types.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2010-2023 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2010-2022 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief This file defines function types to make it easier to dynamically load diff --git a/scripts/dependencies_map.py b/scripts/dependencies_map.py index d6e4c9e3..b5337079 100644 --- a/scripts/dependencies_map.py +++ b/scripts/dependencies_map.py @@ -14,10 +14,10 @@ "appsdk" : ["external/Lib/AMD/APPSDK", "55a6940ebc963daec69152314a1bb94943287d4c"], "opengl" : ["external/Lib/Ext/OpenGL", "792c2291a4443ebef17ca5a7e3e24a1f854f0d1d"], "windows_kits" : ["external/Lib/Ext/Windows-Kits", "51845a3771122a9dc1406b8617e9a67d9a2f55b6"], - "googletest" : ["external/Lib/Ext/GoogleTest", "542e057c6c5bf45454b43764b881397b71164d62"], + "googletest" : ["external/Lib/Ext/GoogleTest", "191f9336bc9212b5f5410ab663176f685cafed2a"], # Src. "adl_util" : ["external/Src/ADLUtil", "d62c94514326775c83fc129bb89d299c8749ebd1"], - "device_info" : ["external/Src/DeviceInfo", "8c2adcc8136dab662a58e93ead3027ee68e318c6"], + "device_info" : ["external/Src/DeviceInfo", "190ec95f2ce1d715231f2ee5e17a65217fc59f6c"], "dynamic_library_module" : ["external/Src/DynamicLibraryModule", "e6451ce26b8509cf724c7cf5d007878791143a58"], "tsingleton" : ["external/Src/TSingleton", "02e8fa7d98f33cdbd0e1f77d1a8a403a32e35882"], } diff --git a/scripts/gpa_packaging.py b/scripts/gpa_packaging.py index 08882436..e0e135bc 100644 --- a/scripts/gpa_packaging.py +++ b/scripts/gpa_packaging.py @@ -251,7 +251,7 @@ def __init__(self): _gpa_binaries.append("GPUPerfAPICL") _other_files=["NOTICES.txt", - "LICENSE"] + "LICENSE.txt"] _version_file="source/gpu_perf_api_common/gpa_version.h" _major_version=0 diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake index fdb01e4c..92176e86 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl.cmake index e5db2a87..5ef3cf4b 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS_CL diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.cc index 7cd41604..f2d4f7a0 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.cc @@ -261,103 +261,103 @@ namespace counter_cl_gfx10 }; GpaCounterGroupExposedCounterDesc kHwClExposedCountersByGroupGfx10[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 461, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 922, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1383, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1844, {0, 24}}, - {5, 1884, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2254, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2624, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2994, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3364, {0, 2}}, - {11, 3430, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3696, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4248, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 4800, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 5129, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 5641, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 6153, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 6665, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 7177, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 7689, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 8201, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 8713, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 9225, {12, 14, 17, 19, 22, 24, 27, 29}}, - {24, 9450, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 9676, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 9902, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 10128, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 10354, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 10580, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 10806, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 11032, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 11258, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 11484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 11710, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 11936, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 12162, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 12388, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 12614, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {39, 12840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 14042, {9, 18, 36, 44, 45, 46}}, - {57, 14119, {9, 18, 36, 44, 45, 46}}, - {58, 14196, {9, 18, 36, 44, 45, 46}}, - {59, 14273, {9, 18, 36, 44, 45, 46}}, - {60, 14350, {9, 18, 36, 44, 45, 46}}, - {61, 14427, {9, 18, 36, 44, 45, 46}}, - {62, 14504, {9, 18, 36, 44, 45, 46}}, - {63, 14581, {9, 18, 36, 44, 45, 46}}, - {64, 14658, {9, 18, 36, 44, 45, 46}}, - {65, 14735, {9, 18, 36, 44, 45, 46}}, - {66, 14812, {9, 18, 36, 44, 45, 46}}, - {67, 14889, {9, 18, 36, 44, 45, 46}}, - {68, 14966, {9, 18, 36, 44, 45, 46}}, - {69, 15043, {9, 18, 36, 44, 45, 46}}, - {70, 15120, {9, 18, 36, 44, 45, 46}}, - {71, 15197, {9, 18, 36, 44, 45, 46}}, - {78, 15583, {55, 57}}, - {79, 15672, {55, 57}}, - {80, 15761, {55, 57}}, - {81, 15850, {55, 57}}, - {82, 15939, {55, 57}}, - {83, 16028, {55, 57}}, - {84, 16117, {55, 57}}, - {85, 16206, {55, 57}}, - {86, 16295, {55, 57}}, - {87, 16384, {55, 57}}, - {88, 16473, {55, 57}}, - {89, 16562, {55, 57}}, - {90, 16651, {55, 57}}, - {91, 16740, {55, 57}}, - {92, 16829, {55, 57}}, - {93, 16918, {55, 57}}, - {97, 17586, {211, 221, 227, 247, 275}}, - {99, 17937, {14, 18}}, - {108, 18517, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {109, 18752, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {110, 18987, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {111, 19222, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {112, 19457, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {113, 19692, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {114, 19927, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {115, 20162, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {116, 20397, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {117, 20632, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {118, 20867, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {119, 21102, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {120, 21337, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {121, 21572, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {122, 21807, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {123, 22042, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {124, 22277, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {125, 22512, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {126, 22747, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {127, 22982, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {128, 23217, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {129, 23452, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {130, 23687, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {131, 23922, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, + {0, 0}, + {1, 461}, + {2, 922}, + {3, 1383}, + {4, 1844}, + {5, 1884}, + {6, 2254}, + {7, 2624}, + {8, 2994}, + {9, 3364}, + {11, 3430}, + {12, 3696}, + {13, 4248}, + {14, 4800}, + {15, 5129}, + {16, 5641}, + {17, 6153}, + {18, 6665}, + {19, 7177}, + {20, 7689}, + {21, 8201}, + {22, 8713}, + {23, 9225}, + {24, 9450}, + {25, 9676}, + {26, 9902}, + {27, 10128}, + {28, 10354}, + {29, 10580}, + {30, 10806}, + {31, 11032}, + {32, 11258}, + {33, 11484}, + {34, 11710}, + {35, 11936}, + {36, 12162}, + {37, 12388}, + {38, 12614}, + {39, 12840}, + {56, 14042}, + {57, 14119}, + {58, 14196}, + {59, 14273}, + {60, 14350}, + {61, 14427}, + {62, 14504}, + {63, 14581}, + {64, 14658}, + {65, 14735}, + {66, 14812}, + {67, 14889}, + {68, 14966}, + {69, 15043}, + {70, 15120}, + {71, 15197}, + {78, 15583}, + {79, 15672}, + {80, 15761}, + {81, 15850}, + {82, 15939}, + {83, 16028}, + {84, 16117}, + {85, 16206}, + {86, 16295}, + {87, 16384}, + {88, 16473}, + {89, 16562}, + {90, 16651}, + {91, 16740}, + {92, 16829}, + {93, 16918}, + {97, 17586}, + {99, 17937}, + {108, 18517}, + {109, 18752}, + {110, 18987}, + {111, 19222}, + {112, 19457}, + {113, 19692}, + {114, 19927}, + {115, 20162}, + {116, 20397}, + {117, 20632}, + {118, 20867}, + {119, 21102}, + {120, 21337}, + {121, 21572}, + {122, 21807}, + {123, 22042}, + {124, 22277}, + {125, 22512}, + {126, 22747}, + {127, 22982}, + {128, 23217}, + {129, 23452}, + {130, 23687}, + {131, 23922}, }; GpaPaddedCounterDesc kClPaddedCounterByGroupGfx10[] = { @@ -430,7 +430,6 @@ namespace counter_cl_gfx10 const std::set kHwClTimestampBlockIdsGfx10 = {}; ///< Timestamp block id's for CL for gfx10 family const std::set kHwClTimeCounterIndicesGfx10 = {}; ///< Timestamp counter indices for CL for gfx10 family const unsigned int kHwClGroupCountGfx10 = static_cast(kHwClGroupsGfx10.size()); - const unsigned int kHwClExposedCountersGroupCountGfx10 = 97; const unsigned int kClPaddedCounterGroupCountGfx10 = 0; const unsigned int kHwClSqGroupCountGfx10 = sizeof(kHwClSqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwClSqIsolatedGroupCountGfx10 = sizeof(kHwClSqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.h index 160ff10c..70b00e99 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx10.h @@ -29,7 +29,6 @@ namespace counter_cl_gfx10 extern const std::set kHwClTimestampBlockIdsGfx10; ///< Timestamp block id's for Cl for Gfx10 family extern const std::set kHwClTimeCounterIndicesGfx10; ///< Timestamp counter indices for Cl for Gfx10 family extern const unsigned int kHwClGroupCountGfx10; ///< Hardware Group Count for Cl for Gfx10 family - extern const unsigned int kHwClExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Cl for Gfx10 family extern const unsigned int kClPaddedCounterGroupCountGfx10; ///< reserved counter group count for Cl for Gfx10 family extern const unsigned int kHwClSqGroupCountGfx10; ///< Hardware SQ Group Count for Cl for Gfx10 family extern const unsigned int kHwClSqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Cl for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.cc index ae0ea5fa..68860674 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.cc @@ -276,118 +276,118 @@ namespace counter_cl_gfx103 }; GpaCounterGroupExposedCounterDesc kHwClExposedCountersByGroupGfx103[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 453, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 906, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1359, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1812, {0, 24}}, - {5, 1852, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2243, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2634, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 3025, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3416, {0, 2}}, - {11, 3482, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3758, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4336, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 4914, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 5246, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 5758, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 6270, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 6782, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 7294, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 7806, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 8318, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 8830, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 9342, {12, 14, 17, 19, 22, 24, 27, 29}}, - {24, 9567, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {25, 9803, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {26, 10039, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {27, 10275, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {28, 10511, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {29, 10747, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {30, 10983, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {31, 11219, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {32, 11455, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {33, 11691, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {34, 11927, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {35, 12163, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {36, 12399, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {37, 12635, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {38, 12871, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {39, 13107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {40, 13343, {82, 116, 117, 118}}, - {41, 13535, {82, 116, 117, 118}}, - {42, 13727, {82, 116, 117, 118}}, - {43, 13919, {82, 116, 117, 118}}, - {44, 14111, {82, 116, 117, 118}}, - {45, 14303, {82, 116, 117, 118}}, - {46, 14495, {82, 116, 117, 118}}, - {47, 14687, {82, 116, 117, 118}}, - {48, 14879, {82, 116, 117, 118}}, - {49, 15071, {82, 116, 117, 118}}, - {50, 15263, {82, 116, 117, 118}}, - {51, 15455, {82, 116, 117, 118}}, - {52, 15647, {82, 116, 117, 118}}, - {53, 15839, {82, 116, 117, 118}}, - {54, 16031, {82, 116, 117, 118}}, - {55, 16223, {82, 116, 117, 118}}, - {56, 16415, {9, 18, 36, 43, 44, 45}}, - {57, 16476, {9, 18, 36, 43, 44, 45}}, - {58, 16537, {9, 18, 36, 43, 44, 45}}, - {59, 16598, {9, 18, 36, 43, 44, 45}}, - {60, 16659, {9, 18, 36, 43, 44, 45}}, - {61, 16720, {9, 18, 36, 43, 44, 45}}, - {62, 16781, {9, 18, 36, 43, 44, 45}}, - {63, 16842, {9, 18, 36, 43, 44, 45}}, - {64, 16903, {9, 18, 36, 43, 44, 45}}, - {65, 16964, {9, 18, 36, 43, 44, 45}}, - {66, 17025, {9, 18, 36, 43, 44, 45}}, - {67, 17086, {9, 18, 36, 43, 44, 45}}, - {68, 17147, {9, 18, 36, 43, 44, 45}}, - {69, 17208, {9, 18, 36, 43, 44, 45}}, - {70, 17269, {9, 18, 36, 43, 44, 45}}, - {71, 17330, {9, 18, 36, 43, 44, 45}}, - {78, 17768, {55, 57}}, - {79, 17858, {55, 57}}, - {80, 17948, {55, 57}}, - {81, 18038, {55, 57}}, - {82, 18128, {55, 57}}, - {83, 18218, {55, 57}}, - {84, 18308, {55, 57}}, - {85, 18398, {55, 57}}, - {86, 18488, {55, 57}}, - {87, 18578, {55, 57}}, - {88, 18668, {55, 57}}, - {89, 18758, {55, 57}}, - {90, 18848, {55, 57}}, - {91, 18938, {55, 57}}, - {92, 19028, {55, 57}}, - {93, 19118, {55, 57}}, - {99, 19852, {14, 18}}, - {108, 20451, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {109, 20705, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {110, 20959, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {111, 21213, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {112, 21467, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {113, 21721, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {114, 21975, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {115, 22229, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {116, 22483, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {117, 22737, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {118, 22991, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {119, 23245, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {120, 23499, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {121, 23753, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {122, 24007, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {123, 24261, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {124, 24515, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {125, 24769, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {126, 25023, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {127, 25277, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {128, 25531, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {129, 25785, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {130, 26039, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {131, 26293, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, + {0, 0}, + {1, 453}, + {2, 906}, + {3, 1359}, + {4, 1812}, + {5, 1852}, + {6, 2243}, + {7, 2634}, + {8, 3025}, + {9, 3416}, + {11, 3482}, + {12, 3758}, + {13, 4336}, + {14, 4914}, + {15, 5246}, + {16, 5758}, + {17, 6270}, + {18, 6782}, + {19, 7294}, + {20, 7806}, + {21, 8318}, + {22, 8830}, + {23, 9342}, + {24, 9567}, + {25, 9803}, + {26, 10039}, + {27, 10275}, + {28, 10511}, + {29, 10747}, + {30, 10983}, + {31, 11219}, + {32, 11455}, + {33, 11691}, + {34, 11927}, + {35, 12163}, + {36, 12399}, + {37, 12635}, + {38, 12871}, + {39, 13107}, + {40, 13343}, + {41, 13535}, + {42, 13727}, + {43, 13919}, + {44, 14111}, + {45, 14303}, + {46, 14495}, + {47, 14687}, + {48, 14879}, + {49, 15071}, + {50, 15263}, + {51, 15455}, + {52, 15647}, + {53, 15839}, + {54, 16031}, + {55, 16223}, + {56, 16415}, + {57, 16476}, + {58, 16537}, + {59, 16598}, + {60, 16659}, + {61, 16720}, + {62, 16781}, + {63, 16842}, + {64, 16903}, + {65, 16964}, + {66, 17025}, + {67, 17086}, + {68, 17147}, + {69, 17208}, + {70, 17269}, + {71, 17330}, + {78, 17768}, + {79, 17858}, + {80, 17948}, + {81, 18038}, + {82, 18128}, + {83, 18218}, + {84, 18308}, + {85, 18398}, + {86, 18488}, + {87, 18578}, + {88, 18668}, + {89, 18758}, + {90, 18848}, + {91, 18938}, + {92, 19028}, + {93, 19118}, + {99, 19852}, + {108, 20451}, + {109, 20705}, + {110, 20959}, + {111, 21213}, + {112, 21467}, + {113, 21721}, + {114, 21975}, + {115, 22229}, + {116, 22483}, + {117, 22737}, + {118, 22991}, + {119, 23245}, + {120, 23499}, + {121, 23753}, + {122, 24007}, + {123, 24261}, + {124, 24515}, + {125, 24769}, + {126, 25023}, + {127, 25277}, + {128, 25531}, + {129, 25785}, + {130, 26039}, + {131, 26293}, }; GpaPaddedCounterDesc kClPaddedCounterByGroupGfx103[] = { @@ -460,7 +460,6 @@ namespace counter_cl_gfx103 const std::set kHwClTimestampBlockIdsGfx103 = {}; ///< Timestamp block id's for CL for gfx103 family const std::set kHwClTimeCounterIndicesGfx103 = {}; ///< Timestamp counter indices for CL for gfx103 family const unsigned int kHwClGroupCountGfx103 = static_cast(kHwClGroupsGfx103.size()); - const unsigned int kHwClExposedCountersGroupCountGfx103 = 112; const unsigned int kClPaddedCounterGroupCountGfx103 = 0; const unsigned int kHwClSqGroupCountGfx103 = sizeof(kHwClSqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwClSqIsolatedGroupCountGfx103 = sizeof(kHwClSqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.h index 752b7c91..33d964c9 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx103.h @@ -29,7 +29,6 @@ namespace counter_cl_gfx103 extern const std::set kHwClTimestampBlockIdsGfx103; ///< Timestamp block id's for Cl for Gfx103 family extern const std::set kHwClTimeCounterIndicesGfx103; ///< Timestamp counter indices for Cl for Gfx103 family extern const unsigned int kHwClGroupCountGfx103; ///< Hardware Group Count for Cl for Gfx103 family - extern const unsigned int kHwClExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Cl for Gfx103 family extern const unsigned int kClPaddedCounterGroupCountGfx103; ///< reserved counter group count for Cl for Gfx103 family extern const unsigned int kHwClSqGroupCountGfx103; ///< Hardware SQ Group Count for Cl for Gfx103 family extern const unsigned int kHwClSqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Cl for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.cc index 5a18fc29..b4785812 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.cc @@ -277,119 +277,119 @@ namespace counter_cl_gfx11 }; GpaCounterGroupExposedCounterDesc kHwClExposedCountersByGroupGfx11[] = { - {0, 0, {5, 19, 21, 30, 32}}, - {1, 314, {5, 19, 21, 30, 32}}, - {2, 628, {5, 19, 21, 30, 32}}, - {3, 942, {5, 19, 21, 30, 32}}, - {4, 1256, {0, 24}}, - {5, 1300, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 1688, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2076, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2464, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 2852, {0, 2}}, - {11, 2923, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3234, {159, 235, 259}}, - {13, 3901, {159, 235, 259}}, - {14, 4568, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {15, 4852, {20, 21, 24}}, - {16, 4889, {20, 21, 24}}, - {17, 4926, {20, 21, 24}}, - {18, 4963, {20, 21, 24}}, - {19, 5000, {20, 21, 24}}, - {20, 5037, {20, 21, 24}}, - {21, 5074, {20, 21, 24}}, - {22, 5111, {20, 21, 24}}, - {23, 5148, {12, 14, 17, 19, 22, 24, 27, 29}}, - {24, 5230, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {25, 5466, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {26, 5702, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {27, 5938, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {28, 6174, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {29, 6410, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {30, 6646, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {31, 6882, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {32, 7118, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {33, 7354, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {34, 7590, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {35, 7826, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {36, 8062, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {37, 8298, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {38, 8534, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {39, 8770, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {40, 9006, {82, 116, 117, 118}}, - {41, 9203, {82, 116, 117, 118}}, - {42, 9400, {82, 116, 117, 118}}, - {43, 9597, {82, 116, 117, 118}}, - {44, 9794, {82, 116, 117, 118}}, - {45, 9991, {82, 116, 117, 118}}, - {46, 10188, {82, 116, 117, 118}}, - {47, 10385, {82, 116, 117, 118}}, - {48, 10582, {82, 116, 117, 118}}, - {49, 10779, {82, 116, 117, 118}}, - {50, 10976, {82, 116, 117, 118}}, - {51, 11173, {82, 116, 117, 118}}, - {52, 11370, {82, 116, 117, 118}}, - {53, 11567, {82, 116, 117, 118}}, - {54, 11764, {82, 116, 117, 118}}, - {55, 11961, {82, 116, 117, 118}}, - {56, 12158, {9, 17, 39, 46, 47, 48}}, - {57, 12236, {9, 17, 39, 46, 47, 48}}, - {58, 12314, {9, 17, 39, 46, 47, 48}}, - {59, 12392, {9, 17, 39, 46, 47, 48}}, - {60, 12470, {9, 17, 39, 46, 47, 48}}, - {61, 12548, {9, 17, 39, 46, 47, 48}}, - {62, 12626, {9, 17, 39, 46, 47, 48}}, - {63, 12704, {9, 17, 39, 46, 47, 48}}, - {64, 12782, {9, 17, 39, 46, 47, 48}}, - {65, 12860, {9, 17, 39, 46, 47, 48}}, - {66, 12938, {9, 17, 39, 46, 47, 48}}, - {67, 13016, {9, 17, 39, 46, 47, 48}}, - {68, 13094, {9, 17, 39, 46, 47, 48}}, - {69, 13172, {9, 17, 39, 46, 47, 48}}, - {70, 13250, {9, 17, 39, 46, 47, 48}}, - {71, 13328, {9, 17, 39, 46, 47, 48}}, - {78, 13795, {55, 57}}, - {79, 13893, {55, 57}}, - {80, 13991, {55, 57}}, - {81, 14089, {55, 57}}, - {82, 14187, {55, 57}}, - {83, 14285, {55, 57}}, - {84, 14383, {55, 57}}, - {85, 14481, {55, 57}}, - {86, 14579, {55, 57}}, - {87, 14677, {55, 57}}, - {88, 14775, {55, 57}}, - {89, 14873, {55, 57}}, - {90, 14971, {55, 57}}, - {91, 15069, {55, 57}}, - {92, 15167, {55, 57}}, - {93, 15265, {55, 57}}, - {98, 15729, {14, 18}}, - {107, 16249, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {108, 16508, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {109, 16767, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {110, 17026, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {111, 17285, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {112, 17544, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {113, 17803, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {114, 18062, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {115, 18321, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {116, 18580, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {117, 18839, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {118, 19098, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {119, 19357, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {120, 19616, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {121, 19875, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {122, 20134, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {123, 20393, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {124, 20652, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {125, 20911, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {126, 21170, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {127, 21429, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {128, 21688, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {129, 21947, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {130, 22206, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {138, 24014, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, + {0, 0}, + {1, 314}, + {2, 628}, + {3, 942}, + {4, 1256}, + {5, 1300}, + {6, 1688}, + {7, 2076}, + {8, 2464}, + {9, 2852}, + {11, 2923}, + {12, 3234}, + {13, 3901}, + {14, 4568}, + {15, 4852}, + {16, 4889}, + {17, 4926}, + {18, 4963}, + {19, 5000}, + {20, 5037}, + {21, 5074}, + {22, 5111}, + {23, 5148}, + {24, 5230}, + {25, 5466}, + {26, 5702}, + {27, 5938}, + {28, 6174}, + {29, 6410}, + {30, 6646}, + {31, 6882}, + {32, 7118}, + {33, 7354}, + {34, 7590}, + {35, 7826}, + {36, 8062}, + {37, 8298}, + {38, 8534}, + {39, 8770}, + {40, 9006}, + {41, 9203}, + {42, 9400}, + {43, 9597}, + {44, 9794}, + {45, 9991}, + {46, 10188}, + {47, 10385}, + {48, 10582}, + {49, 10779}, + {50, 10976}, + {51, 11173}, + {52, 11370}, + {53, 11567}, + {54, 11764}, + {55, 11961}, + {56, 12158}, + {57, 12236}, + {58, 12314}, + {59, 12392}, + {60, 12470}, + {61, 12548}, + {62, 12626}, + {63, 12704}, + {64, 12782}, + {65, 12860}, + {66, 12938}, + {67, 13016}, + {68, 13094}, + {69, 13172}, + {70, 13250}, + {71, 13328}, + {78, 13795}, + {79, 13893}, + {80, 13991}, + {81, 14089}, + {82, 14187}, + {83, 14285}, + {84, 14383}, + {85, 14481}, + {86, 14579}, + {87, 14677}, + {88, 14775}, + {89, 14873}, + {90, 14971}, + {91, 15069}, + {92, 15167}, + {93, 15265}, + {98, 15729}, + {107, 16249}, + {108, 16508}, + {109, 16767}, + {110, 17026}, + {111, 17285}, + {112, 17544}, + {113, 17803}, + {114, 18062}, + {115, 18321}, + {116, 18580}, + {117, 18839}, + {118, 19098}, + {119, 19357}, + {120, 19616}, + {121, 19875}, + {122, 20134}, + {123, 20393}, + {124, 20652}, + {125, 20911}, + {126, 21170}, + {127, 21429}, + {128, 21688}, + {129, 21947}, + {130, 22206}, + {138, 24014}, }; GpaPaddedCounterDesc kClPaddedCounterByGroupGfx11[] = { @@ -463,7 +463,6 @@ namespace counter_cl_gfx11 const std::set kHwClTimestampBlockIdsGfx11 = {}; ///< Timestamp block id's for CL for gfx11 family const std::set kHwClTimeCounterIndicesGfx11 = {}; ///< Timestamp counter indices for CL for gfx11 family const unsigned int kHwClGroupCountGfx11 = static_cast(kHwClGroupsGfx11.size()); - const unsigned int kHwClExposedCountersGroupCountGfx11 = 113; const unsigned int kClPaddedCounterGroupCountGfx11 = 0; const unsigned int kHwClSqGroupCountGfx11 = sizeof(kHwClSqGroupsGfx11) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwClSqIsolatedGroupCountGfx11 = sizeof(kHwClSqIsolatedGroupsGfx11) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.h index d16d3f07..fba8be03 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx11.h @@ -29,7 +29,6 @@ namespace counter_cl_gfx11 extern const std::set kHwClTimestampBlockIdsGfx11; ///< Timestamp block id's for Cl for Gfx11 family extern const std::set kHwClTimeCounterIndicesGfx11; ///< Timestamp counter indices for Cl for Gfx11 family extern const unsigned int kHwClGroupCountGfx11; ///< Hardware Group Count for Cl for Gfx11 family - extern const unsigned int kHwClExposedCountersGroupCountGfx11; ///< Exposed hardware counter Group Count for Cl for Gfx11 family extern const unsigned int kClPaddedCounterGroupCountGfx11; ///< reserved counter group count for Cl for Gfx11 family extern const unsigned int kHwClSqGroupCountGfx11; ///< Hardware SQ Group Count for Cl for Gfx11 family extern const unsigned int kHwClSqIsolatedGroupCountGfx11; ///< Hardware Isolated Group Count for Cl for Gfx11 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.cc index e640fb74..806ea1a3 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.cc @@ -193,76 +193,76 @@ namespace counter_cl_gfx8 }; GpaCounterGroupExposedCounterDesc kHwClExposedCountersByGroupGfx8[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 396, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 792, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1188, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 1603, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 1860, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2117, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2374, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 2631, {0, 2}}, - {11, 2680, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 2833, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {13, 3230, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {14, 3427, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {15, 3726, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {16, 4025, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {17, 4324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {18, 4623, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {19, 4922, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {20, 5221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {21, 5520, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {22, 5819, {12, 14, 17, 19, 22, 24, 27, 29}}, - {23, 5853, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {24, 5972, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 6091, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 6210, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 6329, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 6448, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 6567, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 6686, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 6805, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 6924, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 7043, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 7162, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 7281, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 7400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 7519, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 7638, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 7827, {18, 19, 26, 28, 35}}, - {42, 8019, {18, 19, 26, 28, 35}}, - {43, 8211, {18, 19, 26, 28, 35}}, - {44, 8403, {18, 19, 26, 28, 35}}, - {45, 8595, {18, 19, 26, 28, 35}}, - {46, 8787, {18, 19, 26, 28, 35}}, - {47, 8979, {18, 19, 26, 28, 35}}, - {48, 9171, {18, 19, 26, 28, 35}}, - {49, 9363, {18, 19, 26, 28, 35}}, - {50, 9555, {18, 19, 26, 28, 35}}, - {51, 9747, {18, 19, 26, 28, 35}}, - {52, 9939, {18, 19, 26, 28, 35}}, - {53, 10131, {18, 19, 26, 28, 35}}, - {54, 10323, {18, 19, 26, 28, 35}}, - {55, 10515, {18, 19, 26, 28, 35}}, - {56, 10707, {18, 19, 26, 28, 35}}, - {73, 11779, {3, 7, 8, 9}}, - {74, 11959, {3, 7, 8, 9}}, - {75, 12139, {3, 7, 8, 9}}, - {76, 12319, {3, 7, 8, 9}}, - {77, 12499, {3, 7, 8, 9}}, - {78, 12679, {3, 7, 8, 9}}, - {79, 12859, {3, 7, 8, 9}}, - {80, 13039, {3, 7, 8, 9}}, - {81, 13219, {3, 7, 8, 9}}, - {82, 13399, {3, 7, 8, 9}}, - {83, 13579, {3, 7, 8, 9}}, - {84, 13759, {3, 7, 8, 9}}, - {85, 13939, {3, 7, 8, 9}}, - {86, 14119, {3, 7, 8, 9}}, - {87, 14299, {3, 7, 8, 9}}, - {88, 14479, {3, 7, 8, 9}}, - {90, 14780, {1, 9, 20, 96, 105, 124}}, + {0, 0}, + {1, 396}, + {2, 792}, + {3, 1188}, + {5, 1603}, + {6, 1860}, + {7, 2117}, + {8, 2374}, + {9, 2631}, + {11, 2680}, + {12, 2833}, + {13, 3230}, + {14, 3427}, + {15, 3726}, + {16, 4025}, + {17, 4324}, + {18, 4623}, + {19, 4922}, + {20, 5221}, + {21, 5520}, + {22, 5819}, + {23, 5853}, + {24, 5972}, + {25, 6091}, + {26, 6210}, + {27, 6329}, + {28, 6448}, + {29, 6567}, + {30, 6686}, + {31, 6805}, + {32, 6924}, + {33, 7043}, + {34, 7162}, + {35, 7281}, + {36, 7400}, + {37, 7519}, + {38, 7638}, + {41, 7827}, + {42, 8019}, + {43, 8211}, + {44, 8403}, + {45, 8595}, + {46, 8787}, + {47, 8979}, + {48, 9171}, + {49, 9363}, + {50, 9555}, + {51, 9747}, + {52, 9939}, + {53, 10131}, + {54, 10323}, + {55, 10515}, + {56, 10707}, + {73, 11779}, + {74, 11959}, + {75, 12139}, + {76, 12319}, + {77, 12499}, + {78, 12679}, + {79, 12859}, + {80, 13039}, + {81, 13219}, + {82, 13399}, + {83, 13579}, + {84, 13759}, + {85, 13939}, + {86, 14119}, + {87, 14299}, + {88, 14479}, + {90, 14780}, }; GpaPaddedCounterDesc kClPaddedCounterByGroupGfx8[] = { @@ -353,7 +353,6 @@ namespace counter_cl_gfx8 const std::set kHwClTimestampBlockIdsGfx8 = {}; ///< Timestamp block id's for CL for gfx8 family const std::set kHwClTimeCounterIndicesGfx8 = {}; ///< Timestamp counter indices for CL for gfx8 family const unsigned int kHwClGroupCountGfx8 = static_cast(kHwClGroupsGfx8.size()); - const unsigned int kHwClExposedCountersGroupCountGfx8 = 70; const unsigned int kClPaddedCounterGroupCountGfx8 = 0; const unsigned int kHwClSqGroupCountGfx8 = sizeof(kHwClSqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwClSqIsolatedGroupCountGfx8 = sizeof(kHwClSqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.h index 9571f05e..929edda4 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx8.h @@ -29,7 +29,6 @@ namespace counter_cl_gfx8 extern const std::set kHwClTimestampBlockIdsGfx8; ///< Timestamp block id's for Cl for Gfx8 family extern const std::set kHwClTimeCounterIndicesGfx8; ///< Timestamp counter indices for Cl for Gfx8 family extern const unsigned int kHwClGroupCountGfx8; ///< Hardware Group Count for Cl for Gfx8 family - extern const unsigned int kHwClExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Cl for Gfx8 family extern const unsigned int kClPaddedCounterGroupCountGfx8; ///< reserved counter group count for Cl for Gfx8 family extern const unsigned int kHwClSqGroupCountGfx8; ///< Hardware SQ Group Count for Cl for Gfx8 family extern const unsigned int kHwClSqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Cl for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.cc index 43d180a9..cea7e732 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.cc @@ -267,109 +267,109 @@ namespace counter_cl_gfx9 }; GpaCounterGroupExposedCounterDesc kHwClExposedCountersByGroupGfx9[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 444, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 888, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1332, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1776, {0, 23}}, - {5, 1808, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2136, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2464, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2792, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3120, {0, 2}}, - {11, 3174, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3525, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4017, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {14, 4213, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {15, 4587, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {16, 4961, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {17, 5335, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {18, 5709, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {19, 6083, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {20, 6457, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {21, 6831, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {22, 7205, {12, 14, 17, 19, 22, 24, 27, 29}}, - {23, 7413, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {24, 7532, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 7651, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 7770, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 7889, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 8008, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 8127, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 8246, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 8365, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 8484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 8603, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 8722, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 8841, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 8960, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 9079, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 9198, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 9387, {20, 22, 29, 30, 33, 41, 42}}, - {42, 9669, {20, 22, 29, 30, 33, 41, 42}}, - {43, 9951, {20, 22, 29, 30, 33, 41, 42}}, - {44, 10233, {20, 22, 29, 30, 33, 41, 42}}, - {45, 10515, {20, 22, 29, 30, 33, 41, 42}}, - {46, 10797, {20, 22, 29, 30, 33, 41, 42}}, - {47, 11079, {20, 22, 29, 30, 33, 41, 42}}, - {48, 11361, {20, 22, 29, 30, 33, 41, 42}}, - {49, 11643, {20, 22, 29, 30, 33, 41, 42}}, - {50, 11925, {20, 22, 29, 30, 33, 41, 42}}, - {51, 12207, {20, 22, 29, 30, 33, 41, 42}}, - {52, 12489, {20, 22, 29, 30, 33, 41, 42}}, - {53, 12771, {20, 22, 29, 30, 33, 41, 42}}, - {54, 13053, {20, 22, 29, 30, 33, 41, 42}}, - {55, 13335, {20, 22, 29, 30, 33, 41, 42}}, - {56, 13617, {20, 22, 29, 30, 33, 41, 42}}, - {73, 14811, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {74, 14896, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {75, 14981, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {76, 15066, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {77, 15151, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {78, 15236, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {79, 15321, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {80, 15406, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {81, 15491, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {82, 15576, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {83, 15661, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {84, 15746, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {85, 15831, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {86, 15916, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {87, 16001, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {88, 16086, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {90, 16292, {1, 9, 105, 114, 125, 146}}, - {98, 16678, {55, 57}}, - {99, 16761, {55, 57}}, - {100, 16844, {55, 57}}, - {101, 16927, {55, 57}}, - {102, 17010, {55, 57}}, - {103, 17093, {55, 57}}, - {104, 17176, {55, 57}}, - {105, 17259, {55, 57}}, - {106, 17342, {55, 57}}, - {107, 17425, {55, 57}}, - {108, 17508, {55, 57}}, - {109, 17591, {55, 57}}, - {110, 17674, {55, 57}}, - {111, 17757, {55, 57}}, - {112, 17840, {55, 57}}, - {113, 17923, {55, 57}}, - {114, 18006, {55, 57}}, - {115, 18089, {55, 57}}, - {116, 18172, {55, 57}}, - {117, 18255, {55, 57}}, - {118, 18338, {55, 57}}, - {119, 18421, {55, 57}}, - {120, 18504, {55, 57}}, - {121, 18587, {55, 57}}, - {122, 18670, {55, 57}}, - {123, 18753, {55, 57}}, - {124, 18836, {55, 57}}, - {125, 18919, {55, 57}}, - {126, 19002, {55, 57}}, - {127, 19085, {55, 57}}, - {128, 19168, {55, 57}}, - {129, 19251, {55, 57}}, + {0, 0}, + {1, 444}, + {2, 888}, + {3, 1332}, + {4, 1776}, + {5, 1808}, + {6, 2136}, + {7, 2464}, + {8, 2792}, + {9, 3120}, + {11, 3174}, + {12, 3525}, + {13, 4017}, + {14, 4213}, + {15, 4587}, + {16, 4961}, + {17, 5335}, + {18, 5709}, + {19, 6083}, + {20, 6457}, + {21, 6831}, + {22, 7205}, + {23, 7413}, + {24, 7532}, + {25, 7651}, + {26, 7770}, + {27, 7889}, + {28, 8008}, + {29, 8127}, + {30, 8246}, + {31, 8365}, + {32, 8484}, + {33, 8603}, + {34, 8722}, + {35, 8841}, + {36, 8960}, + {37, 9079}, + {38, 9198}, + {41, 9387}, + {42, 9669}, + {43, 9951}, + {44, 10233}, + {45, 10515}, + {46, 10797}, + {47, 11079}, + {48, 11361}, + {49, 11643}, + {50, 11925}, + {51, 12207}, + {52, 12489}, + {53, 12771}, + {54, 13053}, + {55, 13335}, + {56, 13617}, + {73, 14811}, + {74, 14896}, + {75, 14981}, + {76, 15066}, + {77, 15151}, + {78, 15236}, + {79, 15321}, + {80, 15406}, + {81, 15491}, + {82, 15576}, + {83, 15661}, + {84, 15746}, + {85, 15831}, + {86, 15916}, + {87, 16001}, + {88, 16086}, + {90, 16292}, + {98, 16678}, + {99, 16761}, + {100, 16844}, + {101, 16927}, + {102, 17010}, + {103, 17093}, + {104, 17176}, + {105, 17259}, + {106, 17342}, + {107, 17425}, + {108, 17508}, + {109, 17591}, + {110, 17674}, + {111, 17757}, + {112, 17840}, + {113, 17923}, + {114, 18006}, + {115, 18089}, + {116, 18172}, + {117, 18255}, + {118, 18338}, + {119, 18421}, + {120, 18504}, + {121, 18587}, + {122, 18670}, + {123, 18753}, + {124, 18836}, + {125, 18919}, + {126, 19002}, + {127, 19085}, + {128, 19168}, + {129, 19251}, }; GpaPaddedCounterDesc kClPaddedCounterByGroupGfx9[] = { @@ -514,7 +514,6 @@ namespace counter_cl_gfx9 const std::set kHwClTimestampBlockIdsGfx9 = {}; ///< Timestamp block id's for CL for gfx9 family const std::set kHwClTimeCounterIndicesGfx9 = {}; ///< Timestamp counter indices for CL for gfx9 family const unsigned int kHwClGroupCountGfx9 = static_cast(kHwClGroupsGfx9.size()); - const unsigned int kHwClExposedCountersGroupCountGfx9 = 103; const unsigned int kClPaddedCounterGroupCountGfx9 = 55; const unsigned int kHwClSqGroupCountGfx9 = sizeof(kHwClSqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwClSqIsolatedGroupCountGfx9 = sizeof(kHwClSqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.h index 3b0b7b2a..bc44f102 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_cl_gfx9.h @@ -29,7 +29,6 @@ namespace counter_cl_gfx9 extern const std::set kHwClTimestampBlockIdsGfx9; ///< Timestamp block id's for Cl for Gfx9 family extern const std::set kHwClTimeCounterIndicesGfx9; ///< Timestamp counter indices for Cl for Gfx9 family extern const unsigned int kHwClGroupCountGfx9; ///< Hardware Group Count for Cl for Gfx9 family - extern const unsigned int kHwClExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Cl for Gfx9 family extern const unsigned int kClPaddedCounterGroupCountGfx9; ///< reserved counter group count for Cl for Gfx9 family extern const unsigned int kHwClSqGroupCountGfx9; ///< Hardware SQ Group Count for Cl for Gfx9 family extern const unsigned int kHwClSqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Cl for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11.cmake index fd73ddf6..6c4fb677 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS_DX11 diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.cc index b13a15d0..4fd0978d 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.cc @@ -545,212 +545,212 @@ namespace counter_dx11_gfx10 }; GpaCounterGroupExposedCounterDesc kHwDx11ExposedCountersByGroupGfx10[] = { - {0, 0, {0, 24}}, - {1, 40, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 501, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 962, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1423, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 1884, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {6, 2345, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {7, 2806, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {8, 3267, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {9, 3728, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {10, 4189, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {11, 4650, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {12, 5111, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {13, 5572, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {14, 6033, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {15, 6494, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {16, 6955, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {17, 7416, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {18, 7786, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {19, 8156, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {20, 8526, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {21, 8896, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {22, 9266, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {23, 9636, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {24, 10006, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {25, 10376, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {26, 10746, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {27, 11116, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {28, 11486, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {29, 11856, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {30, 12226, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {31, 12596, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {32, 12966, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {33, 13336, {0, 2}}, - {37, 13428, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {38, 13694, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {39, 13960, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {40, 14226, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {41, 14492, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {42, 15044, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {43, 15596, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {44, 16148, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {45, 16700, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {46, 17252, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {47, 17804, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {48, 18356, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {49, 18908, {12, 14, 17, 19, 22, 24, 27, 29}}, - {50, 19133, {12, 14, 17, 19, 22, 24, 27, 29}}, - {51, 19358, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 19583, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 19808, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {54, 20137, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {55, 20466, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {56, 20978, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {57, 21490, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {58, 22002, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {59, 22514, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {60, 23026, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {61, 23538, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {62, 24050, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {63, 24562, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {64, 25074, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {65, 25586, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {66, 26098, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {67, 26610, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {68, 27122, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {69, 27634, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {70, 28146, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {71, 28658, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 28884, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 29110, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 29336, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 29562, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 29788, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 30014, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 30240, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 30466, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 30692, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 30918, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 31144, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 31370, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 31596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 31822, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 32048, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 32274, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 32500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 32726, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 32952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 33178, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 33404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 33630, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 33856, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 34082, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 34308, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 34534, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 34760, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 34986, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 35212, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 35438, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 35664, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 35890, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 36116, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 36342, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 36568, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 36794, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 37020, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 37246, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 37472, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {151, 40138, {9, 18, 36, 44, 45, 46}}, - {152, 40215, {9, 18, 36, 44, 45, 46}}, - {153, 40292, {9, 18, 36, 44, 45, 46}}, - {154, 40369, {9, 18, 36, 44, 45, 46}}, - {155, 40446, {9, 18, 36, 44, 45, 46}}, - {156, 40523, {9, 18, 36, 44, 45, 46}}, - {157, 40600, {9, 18, 36, 44, 45, 46}}, - {158, 40677, {9, 18, 36, 44, 45, 46}}, - {159, 40754, {9, 18, 36, 44, 45, 46}}, - {160, 40831, {9, 18, 36, 44, 45, 46}}, - {161, 40908, {9, 18, 36, 44, 45, 46}}, - {162, 40985, {9, 18, 36, 44, 45, 46}}, - {163, 41062, {9, 18, 36, 44, 45, 46}}, - {164, 41139, {9, 18, 36, 44, 45, 46}}, - {165, 41216, {9, 18, 36, 44, 45, 46}}, - {166, 41293, {9, 18, 36, 44, 45, 46}}, - {167, 41370, {9, 18, 36, 44, 45, 46}}, - {168, 41447, {9, 18, 36, 44, 45, 46}}, - {169, 41524, {9, 18, 36, 44, 45, 46}}, - {170, 41601, {9, 18, 36, 44, 45, 46}}, - {171, 41678, {9, 18, 36, 44, 45, 46}}, - {172, 41755, {9, 18, 36, 44, 45, 46}}, - {173, 41832, {9, 18, 36, 44, 45, 46}}, - {174, 41909, {9, 18, 36, 44, 45, 46}}, - {175, 41986, {9, 18, 36, 44, 45, 46}}, - {176, 42063, {9, 18, 36, 44, 45, 46}}, - {177, 42140, {9, 18, 36, 44, 45, 46}}, - {178, 42217, {9, 18, 36, 44, 45, 46}}, - {179, 42294, {9, 18, 36, 44, 45, 46}}, - {180, 42371, {9, 18, 36, 44, 45, 46}}, - {181, 42448, {9, 18, 36, 44, 45, 46}}, - {182, 42525, {9, 18, 36, 44, 45, 46}}, - {183, 42602, {9, 18, 36, 44, 45, 46}}, - {184, 42679, {9, 18, 36, 44, 45, 46}}, - {185, 42756, {9, 18, 36, 44, 45, 46}}, - {186, 42833, {9, 18, 36, 44, 45, 46}}, - {187, 42910, {9, 18, 36, 44, 45, 46}}, - {188, 42987, {9, 18, 36, 44, 45, 46}}, - {189, 43064, {9, 18, 36, 44, 45, 46}}, - {190, 43141, {9, 18, 36, 44, 45, 46}}, - {198, 43590, {55, 57}}, - {199, 43679, {55, 57}}, - {200, 43768, {55, 57}}, - {201, 43857, {55, 57}}, - {202, 43946, {55, 57}}, - {203, 44035, {55, 57}}, - {204, 44124, {55, 57}}, - {205, 44213, {55, 57}}, - {206, 44302, {55, 57}}, - {207, 44391, {55, 57}}, - {208, 44480, {55, 57}}, - {209, 44569, {55, 57}}, - {210, 44658, {55, 57}}, - {211, 44747, {55, 57}}, - {212, 44836, {55, 57}}, - {213, 44925, {55, 57}}, - {237, 49456, {211, 221, 227, 247, 275}}, - {246, 50059, {14, 18}}, - {247, 50123, {14, 18}}, - {248, 50187, {14, 18}}, - {249, 50251, {14, 18}}, - {250, 50315, {14, 18}}, - {251, 50379, {14, 18}}, - {252, 50443, {14, 18}}, - {253, 50507, {14, 18}}, - {254, 50571, {14, 18}}, - {255, 50635, {14, 18}}, - {256, 50699, {14, 18}}, - {257, 50763, {14, 18}}, - {258, 50827, {14, 18}}, - {259, 50891, {14, 18}}, - {260, 50955, {14, 18}}, - {261, 51019, {14, 18}}, - {282, 52055, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {283, 52290, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {284, 52525, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {285, 52760, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {286, 52995, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {287, 53230, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {288, 53465, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {289, 53700, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {290, 53935, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {291, 54170, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {292, 54405, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {293, 54640, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {294, 54875, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {295, 55110, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {296, 55345, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {297, 55580, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {298, 55815, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {299, 56050, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {300, 56285, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {301, 56520, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {302, 56755, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {303, 56990, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {304, 57225, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {305, 57460, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {313, 58892, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 501}, + {3, 962}, + {4, 1423}, + {5, 1884}, + {6, 2345}, + {7, 2806}, + {8, 3267}, + {9, 3728}, + {10, 4189}, + {11, 4650}, + {12, 5111}, + {13, 5572}, + {14, 6033}, + {15, 6494}, + {16, 6955}, + {17, 7416}, + {18, 7786}, + {19, 8156}, + {20, 8526}, + {21, 8896}, + {22, 9266}, + {23, 9636}, + {24, 10006}, + {25, 10376}, + {26, 10746}, + {27, 11116}, + {28, 11486}, + {29, 11856}, + {30, 12226}, + {31, 12596}, + {32, 12966}, + {33, 13336}, + {37, 13428}, + {38, 13694}, + {39, 13960}, + {40, 14226}, + {41, 14492}, + {42, 15044}, + {43, 15596}, + {44, 16148}, + {45, 16700}, + {46, 17252}, + {47, 17804}, + {48, 18356}, + {49, 18908}, + {50, 19133}, + {51, 19358}, + {52, 19583}, + {53, 19808}, + {54, 20137}, + {55, 20466}, + {56, 20978}, + {57, 21490}, + {58, 22002}, + {59, 22514}, + {60, 23026}, + {61, 23538}, + {62, 24050}, + {63, 24562}, + {64, 25074}, + {65, 25586}, + {66, 26098}, + {67, 26610}, + {68, 27122}, + {69, 27634}, + {70, 28146}, + {71, 28658}, + {72, 28884}, + {73, 29110}, + {74, 29336}, + {75, 29562}, + {76, 29788}, + {77, 30014}, + {78, 30240}, + {79, 30466}, + {80, 30692}, + {81, 30918}, + {82, 31144}, + {83, 31370}, + {84, 31596}, + {85, 31822}, + {86, 32048}, + {87, 32274}, + {88, 32500}, + {89, 32726}, + {90, 32952}, + {91, 33178}, + {92, 33404}, + {93, 33630}, + {94, 33856}, + {95, 34082}, + {96, 34308}, + {97, 34534}, + {98, 34760}, + {99, 34986}, + {100, 35212}, + {101, 35438}, + {102, 35664}, + {103, 35890}, + {104, 36116}, + {105, 36342}, + {106, 36568}, + {107, 36794}, + {108, 37020}, + {109, 37246}, + {110, 37472}, + {151, 40138}, + {152, 40215}, + {153, 40292}, + {154, 40369}, + {155, 40446}, + {156, 40523}, + {157, 40600}, + {158, 40677}, + {159, 40754}, + {160, 40831}, + {161, 40908}, + {162, 40985}, + {163, 41062}, + {164, 41139}, + {165, 41216}, + {166, 41293}, + {167, 41370}, + {168, 41447}, + {169, 41524}, + {170, 41601}, + {171, 41678}, + {172, 41755}, + {173, 41832}, + {174, 41909}, + {175, 41986}, + {176, 42063}, + {177, 42140}, + {178, 42217}, + {179, 42294}, + {180, 42371}, + {181, 42448}, + {182, 42525}, + {183, 42602}, + {184, 42679}, + {185, 42756}, + {186, 42833}, + {187, 42910}, + {188, 42987}, + {189, 43064}, + {190, 43141}, + {198, 43590}, + {199, 43679}, + {200, 43768}, + {201, 43857}, + {202, 43946}, + {203, 44035}, + {204, 44124}, + {205, 44213}, + {206, 44302}, + {207, 44391}, + {208, 44480}, + {209, 44569}, + {210, 44658}, + {211, 44747}, + {212, 44836}, + {213, 44925}, + {237, 49456}, + {246, 50059}, + {247, 50123}, + {248, 50187}, + {249, 50251}, + {250, 50315}, + {251, 50379}, + {252, 50443}, + {253, 50507}, + {254, 50571}, + {255, 50635}, + {256, 50699}, + {257, 50763}, + {258, 50827}, + {259, 50891}, + {260, 50955}, + {261, 51019}, + {282, 52055}, + {283, 52290}, + {284, 52525}, + {285, 52760}, + {286, 52995}, + {287, 53230}, + {288, 53465}, + {289, 53700}, + {290, 53935}, + {291, 54170}, + {292, 54405}, + {293, 54640}, + {294, 54875}, + {295, 55110}, + {296, 55345}, + {297, 55580}, + {298, 55815}, + {299, 56050}, + {300, 56285}, + {301, 56520}, + {302, 56755}, + {303, 56990}, + {304, 57225}, + {305, 57460}, + {313, 58892}, }; GpaPaddedCounterDesc kDx11PaddedCounterByGroupGfx10[] = { @@ -1226,7 +1226,6 @@ namespace counter_dx11_gfx10 const std::set kHwDx11TimestampBlockIdsGfx10 = {313, 312}; ///< Timestamp block id's for DX11 for gfx10 family const std::set kHwDx11TimeCounterIndicesGfx10 = {58892, 58893, 58894, 58895, 58896, 58897, 58891}; ///< Timestamp counter indices for DX11 for gfx10 family const unsigned int kHwDx11GroupCountGfx10 = static_cast(kHwDx11GroupsGfx10.size()); - const unsigned int kHwDx11ExposedCountersGroupCountGfx10 = 206; const unsigned int kDx11PaddedCounterGroupCountGfx10 = 0; const unsigned int kHwDx11SqGroupCountGfx10 = sizeof(kHwDx11SqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx11SqIsolatedGroupCountGfx10 = sizeof(kHwDx11SqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.h index 5b157e76..b91cc115 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx10.h @@ -39,7 +39,6 @@ namespace counter_dx11_gfx10 extern const std::set kHwDx11TimestampBlockIdsGfx10; ///< Timestamp block id's for Dx11 for Gfx10 family extern const std::set kHwDx11TimeCounterIndicesGfx10; ///< Timestamp counter indices for Dx11 for Gfx10 family extern const unsigned int kHwDx11GroupCountGfx10; ///< Hardware Group Count for Dx11 for Gfx10 family - extern const unsigned int kHwDx11ExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Dx11 for Gfx10 family extern const unsigned int kDx11PaddedCounterGroupCountGfx10; ///< reserved counter group count for Dx11 for Gfx10 family extern const unsigned int kHwDx11SqGroupCountGfx10; ///< Hardware SQ Group Count for Dx11 for Gfx10 family extern const unsigned int kHwDx11SqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Dx11 for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.cc index 96808783..7a9d08b5 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.cc @@ -948,414 +948,414 @@ namespace counter_dx11_gfx103 }; GpaCounterGroupExposedCounterDesc kHwDx11ExposedCountersByGroupGfx103[] = { - {0, 0, {0, 24}}, - {1, 40, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 493, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 946, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1399, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 1852, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {6, 2305, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {7, 2758, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {8, 3211, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {9, 3664, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {10, 4117, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {11, 4570, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {12, 5023, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {13, 5476, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {14, 5929, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {15, 6382, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {16, 6835, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {17, 7288, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {18, 7679, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {19, 8070, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {20, 8461, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {21, 8852, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {22, 9243, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {23, 9634, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {24, 10025, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {25, 10416, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {26, 10807, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {27, 11198, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {28, 11589, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {29, 11980, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {30, 12371, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {31, 12762, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {32, 13153, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {33, 13544, {0, 2}}, - {39, 13674, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {40, 13950, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {41, 14226, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {42, 14502, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {43, 14778, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {44, 15356, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {45, 15934, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {46, 16512, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {47, 17090, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {48, 17668, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {49, 18246, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {50, 18824, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {51, 19402, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {52, 19980, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {53, 20558, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {54, 21136, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {55, 21714, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {56, 22292, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {57, 22870, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {58, 23448, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {59, 24026, {12, 14, 17, 19, 22, 24, 27, 29}}, - {60, 24251, {12, 14, 17, 19, 22, 24, 27, 29}}, - {61, 24476, {12, 14, 17, 19, 22, 24, 27, 29}}, - {62, 24701, {12, 14, 17, 19, 22, 24, 27, 29}}, - {63, 24926, {12, 14, 17, 19, 22, 24, 27, 29}}, - {64, 25151, {12, 14, 17, 19, 22, 24, 27, 29}}, - {65, 25376, {12, 14, 17, 19, 22, 24, 27, 29}}, - {66, 25601, {12, 14, 17, 19, 22, 24, 27, 29}}, - {67, 25826, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {68, 26158, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {69, 26490, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {70, 26822, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {71, 27154, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {72, 27666, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {73, 28178, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {74, 28690, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {75, 29202, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {76, 29714, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {77, 30226, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {78, 30738, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {79, 31250, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {80, 31762, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {81, 32274, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {82, 32786, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {83, 33298, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {84, 33810, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {85, 34322, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {86, 34834, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {87, 35346, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {88, 35858, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {89, 36370, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {90, 36882, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {91, 37394, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {92, 37906, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {93, 38418, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {94, 38930, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {95, 39442, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {96, 39954, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {97, 40466, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {98, 40978, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {99, 41490, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {100, 42002, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {101, 42514, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {102, 43026, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {103, 43538, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 43774, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 44010, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 44246, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 44482, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 44718, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 44954, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 45190, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 45426, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 45662, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 45898, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 46134, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 46370, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 46606, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 46842, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 47078, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 47314, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 47550, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 47786, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 48022, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 48258, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 48494, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 48730, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 48966, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 49202, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 49438, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 49674, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 49910, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 50146, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 50382, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 50618, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 50854, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 51090, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 51326, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 51562, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 51798, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 52034, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 52270, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 52506, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 52742, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 52978, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 53214, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 53450, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {146, 53686, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {147, 53922, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {148, 54158, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {149, 54394, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {150, 54630, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {151, 54866, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {152, 55102, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {153, 55338, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {154, 55574, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {155, 55810, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {156, 56046, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {157, 56282, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {158, 56518, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {159, 56754, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {160, 56990, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {161, 57226, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {162, 57462, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {163, 57698, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {164, 57934, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {165, 58170, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {166, 58406, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {167, 58642, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {168, 58878, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {169, 59114, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {170, 59350, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {171, 59586, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {172, 59822, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {173, 60058, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {174, 60294, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {175, 60530, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {176, 60766, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {177, 61002, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {178, 61238, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {179, 61474, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {180, 61710, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {181, 61946, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {182, 62182, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {183, 62418, {82, 116, 117, 118}}, - {184, 62610, {82, 116, 117, 118}}, - {185, 62802, {82, 116, 117, 118}}, - {186, 62994, {82, 116, 117, 118}}, - {187, 63186, {82, 116, 117, 118}}, - {188, 63378, {82, 116, 117, 118}}, - {189, 63570, {82, 116, 117, 118}}, - {190, 63762, {82, 116, 117, 118}}, - {191, 63954, {82, 116, 117, 118}}, - {192, 64146, {82, 116, 117, 118}}, - {193, 64338, {82, 116, 117, 118}}, - {194, 64530, {82, 116, 117, 118}}, - {195, 64722, {82, 116, 117, 118}}, - {196, 64914, {82, 116, 117, 118}}, - {197, 65106, {82, 116, 117, 118}}, - {198, 65298, {82, 116, 117, 118}}, - {199, 65490, {82, 116, 117, 118}}, - {200, 65682, {82, 116, 117, 118}}, - {201, 65874, {82, 116, 117, 118}}, - {202, 66066, {82, 116, 117, 118}}, - {203, 66258, {82, 116, 117, 118}}, - {204, 66450, {82, 116, 117, 118}}, - {205, 66642, {82, 116, 117, 118}}, - {206, 66834, {82, 116, 117, 118}}, - {207, 67026, {82, 116, 117, 118}}, - {208, 67218, {82, 116, 117, 118}}, - {209, 67410, {82, 116, 117, 118}}, - {210, 67602, {82, 116, 117, 118}}, - {211, 67794, {82, 116, 117, 118}}, - {212, 67986, {82, 116, 117, 118}}, - {213, 68178, {82, 116, 117, 118}}, - {214, 68370, {82, 116, 117, 118}}, - {215, 68562, {82, 116, 117, 118}}, - {216, 68754, {82, 116, 117, 118}}, - {217, 68946, {82, 116, 117, 118}}, - {218, 69138, {82, 116, 117, 118}}, - {219, 69330, {82, 116, 117, 118}}, - {220, 69522, {82, 116, 117, 118}}, - {221, 69714, {82, 116, 117, 118}}, - {222, 69906, {82, 116, 117, 118}}, - {223, 70098, {82, 116, 117, 118}}, - {224, 70290, {82, 116, 117, 118}}, - {225, 70482, {82, 116, 117, 118}}, - {226, 70674, {82, 116, 117, 118}}, - {227, 70866, {82, 116, 117, 118}}, - {228, 71058, {82, 116, 117, 118}}, - {229, 71250, {82, 116, 117, 118}}, - {230, 71442, {82, 116, 117, 118}}, - {231, 71634, {82, 116, 117, 118}}, - {232, 71826, {82, 116, 117, 118}}, - {233, 72018, {82, 116, 117, 118}}, - {234, 72210, {82, 116, 117, 118}}, - {235, 72402, {82, 116, 117, 118}}, - {236, 72594, {82, 116, 117, 118}}, - {237, 72786, {82, 116, 117, 118}}, - {238, 72978, {82, 116, 117, 118}}, - {239, 73170, {82, 116, 117, 118}}, - {240, 73362, {82, 116, 117, 118}}, - {241, 73554, {82, 116, 117, 118}}, - {242, 73746, {82, 116, 117, 118}}, - {243, 73938, {82, 116, 117, 118}}, - {244, 74130, {82, 116, 117, 118}}, - {245, 74322, {82, 116, 117, 118}}, - {246, 74514, {82, 116, 117, 118}}, - {247, 74706, {82, 116, 117, 118}}, - {248, 74898, {82, 116, 117, 118}}, - {249, 75090, {82, 116, 117, 118}}, - {250, 75282, {82, 116, 117, 118}}, - {251, 75474, {82, 116, 117, 118}}, - {252, 75666, {82, 116, 117, 118}}, - {253, 75858, {82, 116, 117, 118}}, - {254, 76050, {82, 116, 117, 118}}, - {255, 76242, {82, 116, 117, 118}}, - {256, 76434, {82, 116, 117, 118}}, - {257, 76626, {82, 116, 117, 118}}, - {258, 76818, {82, 116, 117, 118}}, - {259, 77010, {82, 116, 117, 118}}, - {260, 77202, {82, 116, 117, 118}}, - {261, 77394, {82, 116, 117, 118}}, - {262, 77586, {82, 116, 117, 118}}, - {263, 77778, {9, 18, 36, 43, 44, 45}}, - {264, 77839, {9, 18, 36, 43, 44, 45}}, - {265, 77900, {9, 18, 36, 43, 44, 45}}, - {266, 77961, {9, 18, 36, 43, 44, 45}}, - {267, 78022, {9, 18, 36, 43, 44, 45}}, - {268, 78083, {9, 18, 36, 43, 44, 45}}, - {269, 78144, {9, 18, 36, 43, 44, 45}}, - {270, 78205, {9, 18, 36, 43, 44, 45}}, - {271, 78266, {9, 18, 36, 43, 44, 45}}, - {272, 78327, {9, 18, 36, 43, 44, 45}}, - {273, 78388, {9, 18, 36, 43, 44, 45}}, - {274, 78449, {9, 18, 36, 43, 44, 45}}, - {275, 78510, {9, 18, 36, 43, 44, 45}}, - {276, 78571, {9, 18, 36, 43, 44, 45}}, - {277, 78632, {9, 18, 36, 43, 44, 45}}, - {278, 78693, {9, 18, 36, 43, 44, 45}}, - {279, 78754, {9, 18, 36, 43, 44, 45}}, - {280, 78815, {9, 18, 36, 43, 44, 45}}, - {281, 78876, {9, 18, 36, 43, 44, 45}}, - {282, 78937, {9, 18, 36, 43, 44, 45}}, - {283, 78998, {9, 18, 36, 43, 44, 45}}, - {284, 79059, {9, 18, 36, 43, 44, 45}}, - {285, 79120, {9, 18, 36, 43, 44, 45}}, - {286, 79181, {9, 18, 36, 43, 44, 45}}, - {287, 79242, {9, 18, 36, 43, 44, 45}}, - {288, 79303, {9, 18, 36, 43, 44, 45}}, - {289, 79364, {9, 18, 36, 43, 44, 45}}, - {290, 79425, {9, 18, 36, 43, 44, 45}}, - {291, 79486, {9, 18, 36, 43, 44, 45}}, - {292, 79547, {9, 18, 36, 43, 44, 45}}, - {293, 79608, {9, 18, 36, 43, 44, 45}}, - {294, 79669, {9, 18, 36, 43, 44, 45}}, - {295, 79730, {9, 18, 36, 43, 44, 45}}, - {296, 79791, {9, 18, 36, 43, 44, 45}}, - {297, 79852, {9, 18, 36, 43, 44, 45}}, - {298, 79913, {9, 18, 36, 43, 44, 45}}, - {299, 79974, {9, 18, 36, 43, 44, 45}}, - {300, 80035, {9, 18, 36, 43, 44, 45}}, - {301, 80096, {9, 18, 36, 43, 44, 45}}, - {302, 80157, {9, 18, 36, 43, 44, 45}}, - {303, 80218, {9, 18, 36, 43, 44, 45}}, - {304, 80279, {9, 18, 36, 43, 44, 45}}, - {305, 80340, {9, 18, 36, 43, 44, 45}}, - {306, 80401, {9, 18, 36, 43, 44, 45}}, - {307, 80462, {9, 18, 36, 43, 44, 45}}, - {308, 80523, {9, 18, 36, 43, 44, 45}}, - {309, 80584, {9, 18, 36, 43, 44, 45}}, - {310, 80645, {9, 18, 36, 43, 44, 45}}, - {311, 80706, {9, 18, 36, 43, 44, 45}}, - {312, 80767, {9, 18, 36, 43, 44, 45}}, - {313, 80828, {9, 18, 36, 43, 44, 45}}, - {314, 80889, {9, 18, 36, 43, 44, 45}}, - {315, 80950, {9, 18, 36, 43, 44, 45}}, - {316, 81011, {9, 18, 36, 43, 44, 45}}, - {317, 81072, {9, 18, 36, 43, 44, 45}}, - {318, 81133, {9, 18, 36, 43, 44, 45}}, - {319, 81194, {9, 18, 36, 43, 44, 45}}, - {320, 81255, {9, 18, 36, 43, 44, 45}}, - {321, 81316, {9, 18, 36, 43, 44, 45}}, - {322, 81377, {9, 18, 36, 43, 44, 45}}, - {323, 81438, {9, 18, 36, 43, 44, 45}}, - {324, 81499, {9, 18, 36, 43, 44, 45}}, - {325, 81560, {9, 18, 36, 43, 44, 45}}, - {326, 81621, {9, 18, 36, 43, 44, 45}}, - {327, 81682, {9, 18, 36, 43, 44, 45}}, - {328, 81743, {9, 18, 36, 43, 44, 45}}, - {329, 81804, {9, 18, 36, 43, 44, 45}}, - {330, 81865, {9, 18, 36, 43, 44, 45}}, - {331, 81926, {9, 18, 36, 43, 44, 45}}, - {332, 81987, {9, 18, 36, 43, 44, 45}}, - {333, 82048, {9, 18, 36, 43, 44, 45}}, - {334, 82109, {9, 18, 36, 43, 44, 45}}, - {335, 82170, {9, 18, 36, 43, 44, 45}}, - {336, 82231, {9, 18, 36, 43, 44, 45}}, - {337, 82292, {9, 18, 36, 43, 44, 45}}, - {338, 82353, {9, 18, 36, 43, 44, 45}}, - {339, 82414, {9, 18, 36, 43, 44, 45}}, - {340, 82475, {9, 18, 36, 43, 44, 45}}, - {341, 82536, {9, 18, 36, 43, 44, 45}}, - {342, 82597, {9, 18, 36, 43, 44, 45}}, - {350, 83099, {55, 57}}, - {351, 83189, {55, 57}}, - {352, 83279, {55, 57}}, - {353, 83369, {55, 57}}, - {354, 83459, {55, 57}}, - {355, 83549, {55, 57}}, - {356, 83639, {55, 57}}, - {357, 83729, {55, 57}}, - {358, 83819, {55, 57}}, - {359, 83909, {55, 57}}, - {360, 83999, {55, 57}}, - {361, 84089, {55, 57}}, - {362, 84179, {55, 57}}, - {363, 84269, {55, 57}}, - {364, 84359, {55, 57}}, - {365, 84449, {55, 57}}, - {414, 93409, {14, 18}}, - {415, 93492, {14, 18}}, - {416, 93575, {14, 18}}, - {417, 93658, {14, 18}}, - {418, 93741, {14, 18}}, - {419, 93824, {14, 18}}, - {420, 93907, {14, 18}}, - {421, 93990, {14, 18}}, - {422, 94073, {14, 18}}, - {423, 94156, {14, 18}}, - {424, 94239, {14, 18}}, - {425, 94322, {14, 18}}, - {426, 94405, {14, 18}}, - {427, 94488, {14, 18}}, - {428, 94571, {14, 18}}, - {429, 94654, {14, 18}}, - {430, 94737, {14, 18}}, - {431, 94820, {14, 18}}, - {432, 94903, {14, 18}}, - {433, 94986, {14, 18}}, - {434, 95069, {14, 18}}, - {435, 95152, {14, 18}}, - {436, 95235, {14, 18}}, - {437, 95318, {14, 18}}, - {438, 95401, {14, 18}}, - {439, 95484, {14, 18}}, - {440, 95567, {14, 18}}, - {441, 95650, {14, 18}}, - {442, 95733, {14, 18}}, - {443, 95816, {14, 18}}, - {444, 95899, {14, 18}}, - {445, 95982, {14, 18}}, - {482, 97645, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {483, 97899, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {484, 98153, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {485, 98407, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {486, 98661, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {487, 98915, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {488, 99169, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {489, 99423, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {490, 99677, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {491, 99931, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {492, 100185, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {493, 100439, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {494, 100693, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {495, 100947, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {496, 101201, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {497, 101455, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {508, 103045, {42}}, - {509, 103108, {4, 73, 80, 86, 111}}, - {510, 103247, {4, 73, 80, 86, 111}}, - {511, 103386, {4, 73, 80, 86, 111}}, - {512, 103525, {4, 73, 80, 86, 111}}, - {514, 103665, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 493}, + {3, 946}, + {4, 1399}, + {5, 1852}, + {6, 2305}, + {7, 2758}, + {8, 3211}, + {9, 3664}, + {10, 4117}, + {11, 4570}, + {12, 5023}, + {13, 5476}, + {14, 5929}, + {15, 6382}, + {16, 6835}, + {17, 7288}, + {18, 7679}, + {19, 8070}, + {20, 8461}, + {21, 8852}, + {22, 9243}, + {23, 9634}, + {24, 10025}, + {25, 10416}, + {26, 10807}, + {27, 11198}, + {28, 11589}, + {29, 11980}, + {30, 12371}, + {31, 12762}, + {32, 13153}, + {33, 13544}, + {39, 13674}, + {40, 13950}, + {41, 14226}, + {42, 14502}, + {43, 14778}, + {44, 15356}, + {45, 15934}, + {46, 16512}, + {47, 17090}, + {48, 17668}, + {49, 18246}, + {50, 18824}, + {51, 19402}, + {52, 19980}, + {53, 20558}, + {54, 21136}, + {55, 21714}, + {56, 22292}, + {57, 22870}, + {58, 23448}, + {59, 24026}, + {60, 24251}, + {61, 24476}, + {62, 24701}, + {63, 24926}, + {64, 25151}, + {65, 25376}, + {66, 25601}, + {67, 25826}, + {68, 26158}, + {69, 26490}, + {70, 26822}, + {71, 27154}, + {72, 27666}, + {73, 28178}, + {74, 28690}, + {75, 29202}, + {76, 29714}, + {77, 30226}, + {78, 30738}, + {79, 31250}, + {80, 31762}, + {81, 32274}, + {82, 32786}, + {83, 33298}, + {84, 33810}, + {85, 34322}, + {86, 34834}, + {87, 35346}, + {88, 35858}, + {89, 36370}, + {90, 36882}, + {91, 37394}, + {92, 37906}, + {93, 38418}, + {94, 38930}, + {95, 39442}, + {96, 39954}, + {97, 40466}, + {98, 40978}, + {99, 41490}, + {100, 42002}, + {101, 42514}, + {102, 43026}, + {103, 43538}, + {104, 43774}, + {105, 44010}, + {106, 44246}, + {107, 44482}, + {108, 44718}, + {109, 44954}, + {110, 45190}, + {111, 45426}, + {112, 45662}, + {113, 45898}, + {114, 46134}, + {115, 46370}, + {116, 46606}, + {117, 46842}, + {118, 47078}, + {119, 47314}, + {120, 47550}, + {121, 47786}, + {122, 48022}, + {123, 48258}, + {124, 48494}, + {125, 48730}, + {126, 48966}, + {127, 49202}, + {128, 49438}, + {129, 49674}, + {130, 49910}, + {131, 50146}, + {132, 50382}, + {133, 50618}, + {134, 50854}, + {135, 51090}, + {136, 51326}, + {137, 51562}, + {138, 51798}, + {139, 52034}, + {140, 52270}, + {141, 52506}, + {142, 52742}, + {143, 52978}, + {144, 53214}, + {145, 53450}, + {146, 53686}, + {147, 53922}, + {148, 54158}, + {149, 54394}, + {150, 54630}, + {151, 54866}, + {152, 55102}, + {153, 55338}, + {154, 55574}, + {155, 55810}, + {156, 56046}, + {157, 56282}, + {158, 56518}, + {159, 56754}, + {160, 56990}, + {161, 57226}, + {162, 57462}, + {163, 57698}, + {164, 57934}, + {165, 58170}, + {166, 58406}, + {167, 58642}, + {168, 58878}, + {169, 59114}, + {170, 59350}, + {171, 59586}, + {172, 59822}, + {173, 60058}, + {174, 60294}, + {175, 60530}, + {176, 60766}, + {177, 61002}, + {178, 61238}, + {179, 61474}, + {180, 61710}, + {181, 61946}, + {182, 62182}, + {183, 62418}, + {184, 62610}, + {185, 62802}, + {186, 62994}, + {187, 63186}, + {188, 63378}, + {189, 63570}, + {190, 63762}, + {191, 63954}, + {192, 64146}, + {193, 64338}, + {194, 64530}, + {195, 64722}, + {196, 64914}, + {197, 65106}, + {198, 65298}, + {199, 65490}, + {200, 65682}, + {201, 65874}, + {202, 66066}, + {203, 66258}, + {204, 66450}, + {205, 66642}, + {206, 66834}, + {207, 67026}, + {208, 67218}, + {209, 67410}, + {210, 67602}, + {211, 67794}, + {212, 67986}, + {213, 68178}, + {214, 68370}, + {215, 68562}, + {216, 68754}, + {217, 68946}, + {218, 69138}, + {219, 69330}, + {220, 69522}, + {221, 69714}, + {222, 69906}, + {223, 70098}, + {224, 70290}, + {225, 70482}, + {226, 70674}, + {227, 70866}, + {228, 71058}, + {229, 71250}, + {230, 71442}, + {231, 71634}, + {232, 71826}, + {233, 72018}, + {234, 72210}, + {235, 72402}, + {236, 72594}, + {237, 72786}, + {238, 72978}, + {239, 73170}, + {240, 73362}, + {241, 73554}, + {242, 73746}, + {243, 73938}, + {244, 74130}, + {245, 74322}, + {246, 74514}, + {247, 74706}, + {248, 74898}, + {249, 75090}, + {250, 75282}, + {251, 75474}, + {252, 75666}, + {253, 75858}, + {254, 76050}, + {255, 76242}, + {256, 76434}, + {257, 76626}, + {258, 76818}, + {259, 77010}, + {260, 77202}, + {261, 77394}, + {262, 77586}, + {263, 77778}, + {264, 77839}, + {265, 77900}, + {266, 77961}, + {267, 78022}, + {268, 78083}, + {269, 78144}, + {270, 78205}, + {271, 78266}, + {272, 78327}, + {273, 78388}, + {274, 78449}, + {275, 78510}, + {276, 78571}, + {277, 78632}, + {278, 78693}, + {279, 78754}, + {280, 78815}, + {281, 78876}, + {282, 78937}, + {283, 78998}, + {284, 79059}, + {285, 79120}, + {286, 79181}, + {287, 79242}, + {288, 79303}, + {289, 79364}, + {290, 79425}, + {291, 79486}, + {292, 79547}, + {293, 79608}, + {294, 79669}, + {295, 79730}, + {296, 79791}, + {297, 79852}, + {298, 79913}, + {299, 79974}, + {300, 80035}, + {301, 80096}, + {302, 80157}, + {303, 80218}, + {304, 80279}, + {305, 80340}, + {306, 80401}, + {307, 80462}, + {308, 80523}, + {309, 80584}, + {310, 80645}, + {311, 80706}, + {312, 80767}, + {313, 80828}, + {314, 80889}, + {315, 80950}, + {316, 81011}, + {317, 81072}, + {318, 81133}, + {319, 81194}, + {320, 81255}, + {321, 81316}, + {322, 81377}, + {323, 81438}, + {324, 81499}, + {325, 81560}, + {326, 81621}, + {327, 81682}, + {328, 81743}, + {329, 81804}, + {330, 81865}, + {331, 81926}, + {332, 81987}, + {333, 82048}, + {334, 82109}, + {335, 82170}, + {336, 82231}, + {337, 82292}, + {338, 82353}, + {339, 82414}, + {340, 82475}, + {341, 82536}, + {342, 82597}, + {350, 83099}, + {351, 83189}, + {352, 83279}, + {353, 83369}, + {354, 83459}, + {355, 83549}, + {356, 83639}, + {357, 83729}, + {358, 83819}, + {359, 83909}, + {360, 83999}, + {361, 84089}, + {362, 84179}, + {363, 84269}, + {364, 84359}, + {365, 84449}, + {414, 93409}, + {415, 93492}, + {416, 93575}, + {417, 93658}, + {418, 93741}, + {419, 93824}, + {420, 93907}, + {421, 93990}, + {422, 94073}, + {423, 94156}, + {424, 94239}, + {425, 94322}, + {426, 94405}, + {427, 94488}, + {428, 94571}, + {429, 94654}, + {430, 94737}, + {431, 94820}, + {432, 94903}, + {433, 94986}, + {434, 95069}, + {435, 95152}, + {436, 95235}, + {437, 95318}, + {438, 95401}, + {439, 95484}, + {440, 95567}, + {441, 95650}, + {442, 95733}, + {443, 95816}, + {444, 95899}, + {445, 95982}, + {482, 97645}, + {483, 97899}, + {484, 98153}, + {485, 98407}, + {486, 98661}, + {487, 98915}, + {488, 99169}, + {489, 99423}, + {490, 99677}, + {491, 99931}, + {492, 100185}, + {493, 100439}, + {494, 100693}, + {495, 100947}, + {496, 101201}, + {497, 101455}, + {508, 103045}, + {509, 103108}, + {510, 103247}, + {511, 103386}, + {512, 103525}, + {514, 103665}, }; GpaPaddedCounterDesc kDx11PaddedCounterByGroupGfx103[] = { @@ -2168,7 +2168,6 @@ namespace counter_dx11_gfx103 const std::set kHwDx11TimestampBlockIdsGfx103 = {514, 513}; ///< Timestamp block id's for DX11 for gfx103 family const std::set kHwDx11TimeCounterIndicesGfx103 = {103665, 103666, 103667, 103668, 103669, 103670, 103664}; ///< Timestamp counter indices for DX11 for gfx103 family const unsigned int kHwDx11GroupCountGfx103 = static_cast(kHwDx11GroupsGfx103.size()); - const unsigned int kHwDx11ExposedCountersGroupCountGfx103 = 408; const unsigned int kDx11PaddedCounterGroupCountGfx103 = 0; const unsigned int kHwDx11SqGroupCountGfx103 = sizeof(kHwDx11SqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx11SqIsolatedGroupCountGfx103 = sizeof(kHwDx11SqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.h index 4c168fc5..558fc601 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx103.h @@ -39,7 +39,6 @@ namespace counter_dx11_gfx103 extern const std::set kHwDx11TimestampBlockIdsGfx103; ///< Timestamp block id's for Dx11 for Gfx103 family extern const std::set kHwDx11TimeCounterIndicesGfx103; ///< Timestamp counter indices for Dx11 for Gfx103 family extern const unsigned int kHwDx11GroupCountGfx103; ///< Hardware Group Count for Dx11 for Gfx103 family - extern const unsigned int kHwDx11ExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Dx11 for Gfx103 family extern const unsigned int kDx11PaddedCounterGroupCountGfx103; ///< reserved counter group count for Dx11 for Gfx103 family extern const unsigned int kHwDx11SqGroupCountGfx103; ///< Hardware SQ Group Count for Dx11 for Gfx103 family extern const unsigned int kHwDx11SqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Dx11 for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.cc index 96b82cad..1e7ccbd3 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.cc @@ -1644,766 +1644,766 @@ namespace counter_dx11_gfx11 }; GpaCounterGroupExposedCounterDesc kHwDx11ExposedCountersByGroupGfx11[] = { - {0, 0, {0, 24}}, - {1, 44, {5, 19, 21, 30, 32}}, - {2, 358, {5, 19, 21, 30, 32}}, - {3, 672, {5, 19, 21, 30, 32}}, - {4, 986, {5, 19, 21, 30, 32}}, - {5, 1300, {5, 19, 21, 30, 32}}, - {6, 1614, {5, 19, 21, 30, 32}}, - {7, 1928, {5, 19, 21, 30, 32}}, - {8, 2242, {5, 19, 21, 30, 32}}, - {9, 2556, {5, 19, 21, 30, 32}}, - {10, 2870, {5, 19, 21, 30, 32}}, - {11, 3184, {5, 19, 21, 30, 32}}, - {12, 3498, {5, 19, 21, 30, 32}}, - {13, 3812, {5, 19, 21, 30, 32}}, - {14, 4126, {5, 19, 21, 30, 32}}, - {15, 4440, {5, 19, 21, 30, 32}}, - {16, 4754, {5, 19, 21, 30, 32}}, - {17, 5068, {5, 19, 21, 30, 32}}, - {18, 5382, {5, 19, 21, 30, 32}}, - {19, 5696, {5, 19, 21, 30, 32}}, - {20, 6010, {5, 19, 21, 30, 32}}, - {21, 6324, {5, 19, 21, 30, 32}}, - {22, 6638, {5, 19, 21, 30, 32}}, - {23, 6952, {5, 19, 21, 30, 32}}, - {24, 7266, {5, 19, 21, 30, 32}}, - {25, 7580, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {26, 7968, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {27, 8356, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {28, 8744, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {29, 9132, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {30, 9520, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {31, 9908, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {32, 10296, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {33, 10684, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {34, 11072, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {35, 11460, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {36, 11848, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {37, 12236, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {38, 12624, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {39, 13012, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {40, 13400, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {41, 13788, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {42, 14176, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {43, 14564, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {44, 14952, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {45, 15340, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {46, 15728, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {47, 16116, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {48, 16504, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {49, 16892, {0, 2}}, - {57, 17075, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {58, 17386, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {59, 17697, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {60, 18008, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {61, 18319, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {62, 18630, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {63, 18941, {159, 235, 259}}, - {64, 19608, {159, 235, 259}}, - {65, 20275, {159, 235, 259}}, - {66, 20942, {159, 235, 259}}, - {67, 21609, {159, 235, 259}}, - {68, 22276, {159, 235, 259}}, - {69, 22943, {159, 235, 259}}, - {70, 23610, {159, 235, 259}}, - {71, 24277, {159, 235, 259}}, - {72, 24944, {159, 235, 259}}, - {73, 25611, {159, 235, 259}}, - {74, 26278, {159, 235, 259}}, - {75, 26945, {159, 235, 259}}, - {76, 27612, {159, 235, 259}}, - {77, 28279, {159, 235, 259}}, - {78, 28946, {159, 235, 259}}, - {79, 29613, {159, 235, 259}}, - {80, 30280, {159, 235, 259}}, - {81, 30947, {159, 235, 259}}, - {82, 31614, {159, 235, 259}}, - {83, 32281, {159, 235, 259}}, - {84, 32948, {159, 235, 259}}, - {85, 33615, {159, 235, 259}}, - {86, 34282, {159, 235, 259}}, - {87, 34949, {12, 14, 17, 19, 22, 24, 27, 29}}, - {88, 35031, {12, 14, 17, 19, 22, 24, 27, 29}}, - {89, 35113, {12, 14, 17, 19, 22, 24, 27, 29}}, - {90, 35195, {12, 14, 17, 19, 22, 24, 27, 29}}, - {91, 35277, {12, 14, 17, 19, 22, 24, 27, 29}}, - {92, 35359, {12, 14, 17, 19, 22, 24, 27, 29}}, - {93, 35441, {12, 14, 17, 19, 22, 24, 27, 29}}, - {94, 35523, {12, 14, 17, 19, 22, 24, 27, 29}}, - {95, 35605, {12, 14, 17, 19, 22, 24, 27, 29}}, - {96, 35687, {12, 14, 17, 19, 22, 24, 27, 29}}, - {97, 35769, {12, 14, 17, 19, 22, 24, 27, 29}}, - {98, 35851, {12, 14, 17, 19, 22, 24, 27, 29}}, - {99, 35933, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {100, 36217, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {101, 36501, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {102, 36785, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {103, 37069, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {104, 37353, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {105, 37637, {20, 21, 24}}, - {106, 37674, {20, 21, 24}}, - {107, 37711, {20, 21, 24}}, - {108, 37748, {20, 21, 24}}, - {109, 37785, {20, 21, 24}}, - {110, 37822, {20, 21, 24}}, - {111, 37859, {20, 21, 24}}, - {112, 37896, {20, 21, 24}}, - {113, 37933, {20, 21, 24}}, - {114, 37970, {20, 21, 24}}, - {115, 38007, {20, 21, 24}}, - {116, 38044, {20, 21, 24}}, - {117, 38081, {20, 21, 24}}, - {118, 38118, {20, 21, 24}}, - {119, 38155, {20, 21, 24}}, - {120, 38192, {20, 21, 24}}, - {121, 38229, {20, 21, 24}}, - {122, 38266, {20, 21, 24}}, - {123, 38303, {20, 21, 24}}, - {124, 38340, {20, 21, 24}}, - {125, 38377, {20, 21, 24}}, - {126, 38414, {20, 21, 24}}, - {127, 38451, {20, 21, 24}}, - {128, 38488, {20, 21, 24}}, - {129, 38525, {20, 21, 24}}, - {130, 38562, {20, 21, 24}}, - {131, 38599, {20, 21, 24}}, - {132, 38636, {20, 21, 24}}, - {133, 38673, {20, 21, 24}}, - {134, 38710, {20, 21, 24}}, - {135, 38747, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 38983, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 39219, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 39455, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 39691, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 39927, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 40163, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 40399, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 40635, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 40871, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 41107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {146, 41343, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {147, 41579, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {148, 41815, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {149, 42051, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {150, 42287, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {151, 42523, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {152, 42759, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {153, 42995, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {154, 43231, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {155, 43467, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {156, 43703, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {157, 43939, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {158, 44175, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {159, 44411, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {160, 44647, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {161, 44883, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {162, 45119, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {163, 45355, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {164, 45591, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {165, 45827, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {166, 46063, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {167, 46299, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {168, 46535, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {169, 46771, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {170, 47007, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {171, 47243, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {172, 47479, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {173, 47715, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {174, 47951, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {175, 48187, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {176, 48423, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {177, 48659, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {178, 48895, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {179, 49131, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {180, 49367, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {181, 49603, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {182, 49839, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {183, 50075, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {184, 50311, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {185, 50547, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {186, 50783, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {187, 51019, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {188, 51255, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {189, 51491, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {190, 51727, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {191, 51963, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {192, 52199, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {193, 52435, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {194, 52671, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {195, 52907, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {196, 53143, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {197, 53379, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {198, 53615, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {199, 53851, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {200, 54087, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {201, 54323, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {202, 54559, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {203, 54795, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {204, 55031, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {205, 55267, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {206, 55503, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {207, 55739, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {208, 55975, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {209, 56211, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {210, 56447, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {211, 56683, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {212, 56919, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {213, 57155, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {214, 57391, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {215, 57627, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {216, 57863, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {217, 58099, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {218, 58335, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {219, 58571, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {220, 58807, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {221, 59043, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {222, 59279, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {223, 59515, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {224, 59751, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {225, 59987, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {226, 60223, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {227, 60459, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {228, 60695, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {229, 60931, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {230, 61167, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {231, 61403, {82, 116, 117, 118}}, - {232, 61600, {82, 116, 117, 118}}, - {233, 61797, {82, 116, 117, 118}}, - {234, 61994, {82, 116, 117, 118}}, - {235, 62191, {82, 116, 117, 118}}, - {236, 62388, {82, 116, 117, 118}}, - {237, 62585, {82, 116, 117, 118}}, - {238, 62782, {82, 116, 117, 118}}, - {239, 62979, {82, 116, 117, 118}}, - {240, 63176, {82, 116, 117, 118}}, - {241, 63373, {82, 116, 117, 118}}, - {242, 63570, {82, 116, 117, 118}}, - {243, 63767, {82, 116, 117, 118}}, - {244, 63964, {82, 116, 117, 118}}, - {245, 64161, {82, 116, 117, 118}}, - {246, 64358, {82, 116, 117, 118}}, - {247, 64555, {82, 116, 117, 118}}, - {248, 64752, {82, 116, 117, 118}}, - {249, 64949, {82, 116, 117, 118}}, - {250, 65146, {82, 116, 117, 118}}, - {251, 65343, {82, 116, 117, 118}}, - {252, 65540, {82, 116, 117, 118}}, - {253, 65737, {82, 116, 117, 118}}, - {254, 65934, {82, 116, 117, 118}}, - {255, 66131, {82, 116, 117, 118}}, - {256, 66328, {82, 116, 117, 118}}, - {257, 66525, {82, 116, 117, 118}}, - {258, 66722, {82, 116, 117, 118}}, - {259, 66919, {82, 116, 117, 118}}, - {260, 67116, {82, 116, 117, 118}}, - {261, 67313, {82, 116, 117, 118}}, - {262, 67510, {82, 116, 117, 118}}, - {263, 67707, {82, 116, 117, 118}}, - {264, 67904, {82, 116, 117, 118}}, - {265, 68101, {82, 116, 117, 118}}, - {266, 68298, {82, 116, 117, 118}}, - {267, 68495, {82, 116, 117, 118}}, - {268, 68692, {82, 116, 117, 118}}, - {269, 68889, {82, 116, 117, 118}}, - {270, 69086, {82, 116, 117, 118}}, - {271, 69283, {82, 116, 117, 118}}, - {272, 69480, {82, 116, 117, 118}}, - {273, 69677, {82, 116, 117, 118}}, - {274, 69874, {82, 116, 117, 118}}, - {275, 70071, {82, 116, 117, 118}}, - {276, 70268, {82, 116, 117, 118}}, - {277, 70465, {82, 116, 117, 118}}, - {278, 70662, {82, 116, 117, 118}}, - {279, 70859, {82, 116, 117, 118}}, - {280, 71056, {82, 116, 117, 118}}, - {281, 71253, {82, 116, 117, 118}}, - {282, 71450, {82, 116, 117, 118}}, - {283, 71647, {82, 116, 117, 118}}, - {284, 71844, {82, 116, 117, 118}}, - {285, 72041, {82, 116, 117, 118}}, - {286, 72238, {82, 116, 117, 118}}, - {287, 72435, {82, 116, 117, 118}}, - {288, 72632, {82, 116, 117, 118}}, - {289, 72829, {82, 116, 117, 118}}, - {290, 73026, {82, 116, 117, 118}}, - {291, 73223, {82, 116, 117, 118}}, - {292, 73420, {82, 116, 117, 118}}, - {293, 73617, {82, 116, 117, 118}}, - {294, 73814, {82, 116, 117, 118}}, - {295, 74011, {82, 116, 117, 118}}, - {296, 74208, {82, 116, 117, 118}}, - {297, 74405, {82, 116, 117, 118}}, - {298, 74602, {82, 116, 117, 118}}, - {299, 74799, {82, 116, 117, 118}}, - {300, 74996, {82, 116, 117, 118}}, - {301, 75193, {82, 116, 117, 118}}, - {302, 75390, {82, 116, 117, 118}}, - {303, 75587, {82, 116, 117, 118}}, - {304, 75784, {82, 116, 117, 118}}, - {305, 75981, {82, 116, 117, 118}}, - {306, 76178, {82, 116, 117, 118}}, - {307, 76375, {82, 116, 117, 118}}, - {308, 76572, {82, 116, 117, 118}}, - {309, 76769, {82, 116, 117, 118}}, - {310, 76966, {82, 116, 117, 118}}, - {311, 77163, {82, 116, 117, 118}}, - {312, 77360, {82, 116, 117, 118}}, - {313, 77557, {82, 116, 117, 118}}, - {314, 77754, {82, 116, 117, 118}}, - {315, 77951, {82, 116, 117, 118}}, - {316, 78148, {82, 116, 117, 118}}, - {317, 78345, {82, 116, 117, 118}}, - {318, 78542, {82, 116, 117, 118}}, - {319, 78739, {82, 116, 117, 118}}, - {320, 78936, {82, 116, 117, 118}}, - {321, 79133, {82, 116, 117, 118}}, - {322, 79330, {82, 116, 117, 118}}, - {323, 79527, {82, 116, 117, 118}}, - {324, 79724, {82, 116, 117, 118}}, - {325, 79921, {82, 116, 117, 118}}, - {326, 80118, {82, 116, 117, 118}}, - {327, 80315, {9, 17, 39, 46, 47, 48}}, - {328, 80393, {9, 17, 39, 46, 47, 48}}, - {329, 80471, {9, 17, 39, 46, 47, 48}}, - {330, 80549, {9, 17, 39, 46, 47, 48}}, - {331, 80627, {9, 17, 39, 46, 47, 48}}, - {332, 80705, {9, 17, 39, 46, 47, 48}}, - {333, 80783, {9, 17, 39, 46, 47, 48}}, - {334, 80861, {9, 17, 39, 46, 47, 48}}, - {335, 80939, {9, 17, 39, 46, 47, 48}}, - {336, 81017, {9, 17, 39, 46, 47, 48}}, - {337, 81095, {9, 17, 39, 46, 47, 48}}, - {338, 81173, {9, 17, 39, 46, 47, 48}}, - {339, 81251, {9, 17, 39, 46, 47, 48}}, - {340, 81329, {9, 17, 39, 46, 47, 48}}, - {341, 81407, {9, 17, 39, 46, 47, 48}}, - {342, 81485, {9, 17, 39, 46, 47, 48}}, - {343, 81563, {9, 17, 39, 46, 47, 48}}, - {344, 81641, {9, 17, 39, 46, 47, 48}}, - {345, 81719, {9, 17, 39, 46, 47, 48}}, - {346, 81797, {9, 17, 39, 46, 47, 48}}, - {347, 81875, {9, 17, 39, 46, 47, 48}}, - {348, 81953, {9, 17, 39, 46, 47, 48}}, - {349, 82031, {9, 17, 39, 46, 47, 48}}, - {350, 82109, {9, 17, 39, 46, 47, 48}}, - {351, 82187, {9, 17, 39, 46, 47, 48}}, - {352, 82265, {9, 17, 39, 46, 47, 48}}, - {353, 82343, {9, 17, 39, 46, 47, 48}}, - {354, 82421, {9, 17, 39, 46, 47, 48}}, - {355, 82499, {9, 17, 39, 46, 47, 48}}, - {356, 82577, {9, 17, 39, 46, 47, 48}}, - {357, 82655, {9, 17, 39, 46, 47, 48}}, - {358, 82733, {9, 17, 39, 46, 47, 48}}, - {359, 82811, {9, 17, 39, 46, 47, 48}}, - {360, 82889, {9, 17, 39, 46, 47, 48}}, - {361, 82967, {9, 17, 39, 46, 47, 48}}, - {362, 83045, {9, 17, 39, 46, 47, 48}}, - {363, 83123, {9, 17, 39, 46, 47, 48}}, - {364, 83201, {9, 17, 39, 46, 47, 48}}, - {365, 83279, {9, 17, 39, 46, 47, 48}}, - {366, 83357, {9, 17, 39, 46, 47, 48}}, - {367, 83435, {9, 17, 39, 46, 47, 48}}, - {368, 83513, {9, 17, 39, 46, 47, 48}}, - {369, 83591, {9, 17, 39, 46, 47, 48}}, - {370, 83669, {9, 17, 39, 46, 47, 48}}, - {371, 83747, {9, 17, 39, 46, 47, 48}}, - {372, 83825, {9, 17, 39, 46, 47, 48}}, - {373, 83903, {9, 17, 39, 46, 47, 48}}, - {374, 83981, {9, 17, 39, 46, 47, 48}}, - {375, 84059, {9, 17, 39, 46, 47, 48}}, - {376, 84137, {9, 17, 39, 46, 47, 48}}, - {377, 84215, {9, 17, 39, 46, 47, 48}}, - {378, 84293, {9, 17, 39, 46, 47, 48}}, - {379, 84371, {9, 17, 39, 46, 47, 48}}, - {380, 84449, {9, 17, 39, 46, 47, 48}}, - {381, 84527, {9, 17, 39, 46, 47, 48}}, - {382, 84605, {9, 17, 39, 46, 47, 48}}, - {383, 84683, {9, 17, 39, 46, 47, 48}}, - {384, 84761, {9, 17, 39, 46, 47, 48}}, - {385, 84839, {9, 17, 39, 46, 47, 48}}, - {386, 84917, {9, 17, 39, 46, 47, 48}}, - {387, 84995, {9, 17, 39, 46, 47, 48}}, - {388, 85073, {9, 17, 39, 46, 47, 48}}, - {389, 85151, {9, 17, 39, 46, 47, 48}}, - {390, 85229, {9, 17, 39, 46, 47, 48}}, - {391, 85307, {9, 17, 39, 46, 47, 48}}, - {392, 85385, {9, 17, 39, 46, 47, 48}}, - {393, 85463, {9, 17, 39, 46, 47, 48}}, - {394, 85541, {9, 17, 39, 46, 47, 48}}, - {395, 85619, {9, 17, 39, 46, 47, 48}}, - {396, 85697, {9, 17, 39, 46, 47, 48}}, - {397, 85775, {9, 17, 39, 46, 47, 48}}, - {398, 85853, {9, 17, 39, 46, 47, 48}}, - {399, 85931, {9, 17, 39, 46, 47, 48}}, - {400, 86009, {9, 17, 39, 46, 47, 48}}, - {401, 86087, {9, 17, 39, 46, 47, 48}}, - {402, 86165, {9, 17, 39, 46, 47, 48}}, - {403, 86243, {9, 17, 39, 46, 47, 48}}, - {404, 86321, {9, 17, 39, 46, 47, 48}}, - {405, 86399, {9, 17, 39, 46, 47, 48}}, - {406, 86477, {9, 17, 39, 46, 47, 48}}, - {407, 86555, {9, 17, 39, 46, 47, 48}}, - {408, 86633, {9, 17, 39, 46, 47, 48}}, - {409, 86711, {9, 17, 39, 46, 47, 48}}, - {410, 86789, {9, 17, 39, 46, 47, 48}}, - {411, 86867, {9, 17, 39, 46, 47, 48}}, - {412, 86945, {9, 17, 39, 46, 47, 48}}, - {413, 87023, {9, 17, 39, 46, 47, 48}}, - {414, 87101, {9, 17, 39, 46, 47, 48}}, - {415, 87179, {9, 17, 39, 46, 47, 48}}, - {416, 87257, {9, 17, 39, 46, 47, 48}}, - {417, 87335, {9, 17, 39, 46, 47, 48}}, - {418, 87413, {9, 17, 39, 46, 47, 48}}, - {419, 87491, {9, 17, 39, 46, 47, 48}}, - {420, 87569, {9, 17, 39, 46, 47, 48}}, - {421, 87647, {9, 17, 39, 46, 47, 48}}, - {422, 87725, {9, 17, 39, 46, 47, 48}}, - {428, 88254, {55, 57}}, - {429, 88352, {55, 57}}, - {430, 88450, {55, 57}}, - {431, 88548, {55, 57}}, - {432, 88646, {55, 57}}, - {433, 88744, {55, 57}}, - {434, 88842, {55, 57}}, - {435, 88940, {55, 57}}, - {436, 89038, {55, 57}}, - {437, 89136, {55, 57}}, - {438, 89234, {55, 57}}, - {439, 89332, {55, 57}}, - {440, 89430, {55, 57}}, - {441, 89528, {55, 57}}, - {442, 89626, {55, 57}}, - {443, 89724, {55, 57}}, - {444, 89822, {55, 57}}, - {445, 89920, {55, 57}}, - {446, 90018, {55, 57}}, - {447, 90116, {55, 57}}, - {448, 90214, {55, 57}}, - {449, 90312, {55, 57}}, - {450, 90410, {55, 57}}, - {451, 90508, {55, 57}}, - {520, 98021, {14, 18}}, - {521, 98105, {14, 18}}, - {522, 98189, {14, 18}}, - {523, 98273, {14, 18}}, - {524, 98357, {14, 18}}, - {525, 98441, {14, 18}}, - {526, 98525, {14, 18}}, - {527, 98609, {14, 18}}, - {528, 98693, {14, 18}}, - {529, 98777, {14, 18}}, - {530, 98861, {14, 18}}, - {531, 98945, {14, 18}}, - {532, 99029, {14, 18}}, - {533, 99113, {14, 18}}, - {534, 99197, {14, 18}}, - {535, 99281, {14, 18}}, - {536, 99365, {14, 18}}, - {537, 99449, {14, 18}}, - {538, 99533, {14, 18}}, - {539, 99617, {14, 18}}, - {540, 99701, {14, 18}}, - {541, 99785, {14, 18}}, - {542, 99869, {14, 18}}, - {543, 99953, {14, 18}}, - {544, 100037, {14, 18}}, - {545, 100121, {14, 18}}, - {546, 100205, {14, 18}}, - {547, 100289, {14, 18}}, - {548, 100373, {14, 18}}, - {549, 100457, {14, 18}}, - {550, 100541, {14, 18}}, - {551, 100625, {14, 18}}, - {552, 100709, {14, 18}}, - {553, 100793, {14, 18}}, - {554, 100877, {14, 18}}, - {555, 100961, {14, 18}}, - {556, 101045, {14, 18}}, - {557, 101129, {14, 18}}, - {558, 101213, {14, 18}}, - {559, 101297, {14, 18}}, - {560, 101381, {14, 18}}, - {561, 101465, {14, 18}}, - {562, 101549, {14, 18}}, - {563, 101633, {14, 18}}, - {564, 101717, {14, 18}}, - {565, 101801, {14, 18}}, - {566, 101885, {14, 18}}, - {567, 101969, {14, 18}}, - {572, 102485, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {573, 102744, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {574, 103003, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {575, 103262, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {576, 103521, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {577, 103780, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {578, 104039, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {579, 104298, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {580, 104557, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {581, 104816, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {582, 105075, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {583, 105334, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {584, 105593, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {585, 105852, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {586, 106111, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {587, 106370, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {588, 106629, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {589, 106888, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {590, 107147, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {591, 107406, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {592, 107665, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {593, 107924, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {594, 108183, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {595, 108442, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {610, 110693, {39}}, - {611, 110794, {0, 12, 17, 23, 79, 80}}, - {612, 110882, {0, 12, 17, 23, 79, 80}}, - {613, 110970, {0, 12, 17, 23, 79, 80}}, - {614, 111058, {0, 12, 17, 23, 79, 80}}, - {615, 111146, {0, 12, 17, 23, 79, 80}}, - {616, 111234, {0, 12, 17, 23, 79, 80}}, - {617, 111322, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {618, 111834, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {619, 112346, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {620, 112858, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {621, 113370, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {622, 113882, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {623, 114394, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {624, 114906, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {625, 115418, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {626, 115930, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {627, 116442, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {628, 116954, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {629, 117466, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {630, 117978, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {631, 118490, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {632, 119002, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {633, 119514, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {634, 120026, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {635, 120538, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {636, 121050, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {637, 121562, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {638, 122074, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {639, 122586, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {640, 123098, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {641, 123610, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {642, 124122, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {643, 124634, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {644, 125146, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {645, 125658, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {646, 126170, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {647, 126682, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {648, 127194, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {649, 127706, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {650, 128218, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {651, 128730, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {652, 129242, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {653, 129754, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {654, 130266, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {655, 130778, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {656, 131290, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {657, 131802, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {658, 132314, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {659, 132826, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {660, 133338, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {661, 133850, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {662, 134362, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {663, 134874, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {664, 135386, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {665, 135898, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {666, 136410, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {667, 136922, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {668, 137434, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {669, 137946, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {670, 138458, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {671, 138970, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {672, 139482, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {673, 139994, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {674, 140506, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {675, 141018, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {676, 141530, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {677, 142042, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {678, 142554, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {679, 143066, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {680, 143578, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {681, 144090, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {682, 144602, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {683, 145114, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {684, 145626, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {685, 146138, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {686, 146650, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {687, 147162, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {688, 147674, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {689, 148186, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {690, 148698, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {691, 149210, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {692, 149722, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {693, 150234, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {694, 150746, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {695, 151258, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {696, 151770, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {697, 152282, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {698, 152794, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {699, 153306, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {700, 153818, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {701, 154330, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {702, 154842, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {703, 155354, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {704, 155866, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {705, 156378, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {706, 156890, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {707, 157402, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {708, 157914, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {709, 158426, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {710, 158938, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {711, 159450, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {712, 159962, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {713, 160474, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {714, 160986, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {715, 161498, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {716, 162010, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {717, 162522, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {718, 163034, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {719, 163546, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {720, 164058, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {721, 164570, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {722, 165082, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {723, 165594, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {724, 166106, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {725, 166618, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {726, 167130, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {727, 167642, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {728, 168154, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {729, 168666, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {730, 169178, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {731, 169690, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {732, 170202, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {733, 170714, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {734, 171226, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {735, 171738, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {736, 172250, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {737, 172762, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {738, 173274, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {739, 173786, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {740, 174298, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {741, 174810, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {742, 175322, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {743, 175834, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {744, 176346, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {745, 176858, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {746, 177370, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {747, 177882, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {748, 178394, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {749, 178906, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {750, 179418, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {751, 179930, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {752, 180442, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {753, 180954, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {754, 181466, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {755, 181978, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {756, 182490, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {757, 183002, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {758, 183514, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {759, 184026, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {760, 184538, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {761, 185050, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {762, 185562, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {763, 186074, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {764, 186586, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {765, 187098, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {766, 187610, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {767, 188122, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {768, 188634, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {769, 189146, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {770, 189658, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {771, 190170, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {772, 190682, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {773, 191194, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {774, 191706, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {775, 192218, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {776, 192730, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {777, 193242, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {778, 193754, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {779, 194266, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {780, 194778, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {781, 195290, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {782, 195802, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {783, 196314, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {784, 196826, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {785, 197338, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {786, 197850, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {787, 198362, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {788, 198874, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {789, 199386, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {790, 199898, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {791, 200410, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {792, 200922, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {793, 201434, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {794, 201946, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {795, 202458, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {796, 202970, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {797, 203482, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {798, 203994, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {799, 204506, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {800, 205018, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {801, 205530, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {802, 206042, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {803, 206554, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {804, 207066, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {805, 207578, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {806, 208090, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {807, 208602, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {808, 209114, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {809, 209626, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {810, 210138, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {811, 210650, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {812, 211162, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {813, 211674, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {814, 212186, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {815, 212698, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {816, 213210, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {817, 213722, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {818, 214234, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {819, 214746, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {820, 215258, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {821, 215770, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {822, 216282, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {823, 216794, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {824, 217306, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {825, 217818, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {826, 218330, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {827, 218842, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {828, 219354, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {829, 219866, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {830, 220378, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {831, 220890, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {832, 221402, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {833, 221914, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {834, 222426, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {835, 222938, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {836, 223450, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {837, 223962, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {838, 224474, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {839, 224986, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {840, 225498, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {841, 226010, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {842, 226522, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {843, 227034, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {844, 227546, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {845, 228058, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {846, 228570, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {847, 229082, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {848, 229594, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {849, 230106, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {850, 230618, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {851, 231130, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {852, 231642, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {853, 232154, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {854, 232666, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {855, 233178, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {856, 233690, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {858, 234203, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 44}, + {2, 358}, + {3, 672}, + {4, 986}, + {5, 1300}, + {6, 1614}, + {7, 1928}, + {8, 2242}, + {9, 2556}, + {10, 2870}, + {11, 3184}, + {12, 3498}, + {13, 3812}, + {14, 4126}, + {15, 4440}, + {16, 4754}, + {17, 5068}, + {18, 5382}, + {19, 5696}, + {20, 6010}, + {21, 6324}, + {22, 6638}, + {23, 6952}, + {24, 7266}, + {25, 7580}, + {26, 7968}, + {27, 8356}, + {28, 8744}, + {29, 9132}, + {30, 9520}, + {31, 9908}, + {32, 10296}, + {33, 10684}, + {34, 11072}, + {35, 11460}, + {36, 11848}, + {37, 12236}, + {38, 12624}, + {39, 13012}, + {40, 13400}, + {41, 13788}, + {42, 14176}, + {43, 14564}, + {44, 14952}, + {45, 15340}, + {46, 15728}, + {47, 16116}, + {48, 16504}, + {49, 16892}, + {57, 17075}, + {58, 17386}, + {59, 17697}, + {60, 18008}, + {61, 18319}, + {62, 18630}, + {63, 18941}, + {64, 19608}, + {65, 20275}, + {66, 20942}, + {67, 21609}, + {68, 22276}, + {69, 22943}, + {70, 23610}, + {71, 24277}, + {72, 24944}, + {73, 25611}, + {74, 26278}, + {75, 26945}, + {76, 27612}, + {77, 28279}, + {78, 28946}, + {79, 29613}, + {80, 30280}, + {81, 30947}, + {82, 31614}, + {83, 32281}, + {84, 32948}, + {85, 33615}, + {86, 34282}, + {87, 34949}, + {88, 35031}, + {89, 35113}, + {90, 35195}, + {91, 35277}, + {92, 35359}, + {93, 35441}, + {94, 35523}, + {95, 35605}, + {96, 35687}, + {97, 35769}, + {98, 35851}, + {99, 35933}, + {100, 36217}, + {101, 36501}, + {102, 36785}, + {103, 37069}, + {104, 37353}, + {105, 37637}, + {106, 37674}, + {107, 37711}, + {108, 37748}, + {109, 37785}, + {110, 37822}, + {111, 37859}, + {112, 37896}, + {113, 37933}, + {114, 37970}, + {115, 38007}, + {116, 38044}, + {117, 38081}, + {118, 38118}, + {119, 38155}, + {120, 38192}, + {121, 38229}, + {122, 38266}, + {123, 38303}, + {124, 38340}, + {125, 38377}, + {126, 38414}, + {127, 38451}, + {128, 38488}, + {129, 38525}, + {130, 38562}, + {131, 38599}, + {132, 38636}, + {133, 38673}, + {134, 38710}, + {135, 38747}, + {136, 38983}, + {137, 39219}, + {138, 39455}, + {139, 39691}, + {140, 39927}, + {141, 40163}, + {142, 40399}, + {143, 40635}, + {144, 40871}, + {145, 41107}, + {146, 41343}, + {147, 41579}, + {148, 41815}, + {149, 42051}, + {150, 42287}, + {151, 42523}, + {152, 42759}, + {153, 42995}, + {154, 43231}, + {155, 43467}, + {156, 43703}, + {157, 43939}, + {158, 44175}, + {159, 44411}, + {160, 44647}, + {161, 44883}, + {162, 45119}, + {163, 45355}, + {164, 45591}, + {165, 45827}, + {166, 46063}, + {167, 46299}, + {168, 46535}, + {169, 46771}, + {170, 47007}, + {171, 47243}, + {172, 47479}, + {173, 47715}, + {174, 47951}, + {175, 48187}, + {176, 48423}, + {177, 48659}, + {178, 48895}, + {179, 49131}, + {180, 49367}, + {181, 49603}, + {182, 49839}, + {183, 50075}, + {184, 50311}, + {185, 50547}, + {186, 50783}, + {187, 51019}, + {188, 51255}, + {189, 51491}, + {190, 51727}, + {191, 51963}, + {192, 52199}, + {193, 52435}, + {194, 52671}, + {195, 52907}, + {196, 53143}, + {197, 53379}, + {198, 53615}, + {199, 53851}, + {200, 54087}, + {201, 54323}, + {202, 54559}, + {203, 54795}, + {204, 55031}, + {205, 55267}, + {206, 55503}, + {207, 55739}, + {208, 55975}, + {209, 56211}, + {210, 56447}, + {211, 56683}, + {212, 56919}, + {213, 57155}, + {214, 57391}, + {215, 57627}, + {216, 57863}, + {217, 58099}, + {218, 58335}, + {219, 58571}, + {220, 58807}, + {221, 59043}, + {222, 59279}, + {223, 59515}, + {224, 59751}, + {225, 59987}, + {226, 60223}, + {227, 60459}, + {228, 60695}, + {229, 60931}, + {230, 61167}, + {231, 61403}, + {232, 61600}, + {233, 61797}, + {234, 61994}, + {235, 62191}, + {236, 62388}, + {237, 62585}, + {238, 62782}, + {239, 62979}, + {240, 63176}, + {241, 63373}, + {242, 63570}, + {243, 63767}, + {244, 63964}, + {245, 64161}, + {246, 64358}, + {247, 64555}, + {248, 64752}, + {249, 64949}, + {250, 65146}, + {251, 65343}, + {252, 65540}, + {253, 65737}, + {254, 65934}, + {255, 66131}, + {256, 66328}, + {257, 66525}, + {258, 66722}, + {259, 66919}, + {260, 67116}, + {261, 67313}, + {262, 67510}, + {263, 67707}, + {264, 67904}, + {265, 68101}, + {266, 68298}, + {267, 68495}, + {268, 68692}, + {269, 68889}, + {270, 69086}, + {271, 69283}, + {272, 69480}, + {273, 69677}, + {274, 69874}, + {275, 70071}, + {276, 70268}, + {277, 70465}, + {278, 70662}, + {279, 70859}, + {280, 71056}, + {281, 71253}, + {282, 71450}, + {283, 71647}, + {284, 71844}, + {285, 72041}, + {286, 72238}, + {287, 72435}, + {288, 72632}, + {289, 72829}, + {290, 73026}, + {291, 73223}, + {292, 73420}, + {293, 73617}, + {294, 73814}, + {295, 74011}, + {296, 74208}, + {297, 74405}, + {298, 74602}, + {299, 74799}, + {300, 74996}, + {301, 75193}, + {302, 75390}, + {303, 75587}, + {304, 75784}, + {305, 75981}, + {306, 76178}, + {307, 76375}, + {308, 76572}, + {309, 76769}, + {310, 76966}, + {311, 77163}, + {312, 77360}, + {313, 77557}, + {314, 77754}, + {315, 77951}, + {316, 78148}, + {317, 78345}, + {318, 78542}, + {319, 78739}, + {320, 78936}, + {321, 79133}, + {322, 79330}, + {323, 79527}, + {324, 79724}, + {325, 79921}, + {326, 80118}, + {327, 80315}, + {328, 80393}, + {329, 80471}, + {330, 80549}, + {331, 80627}, + {332, 80705}, + {333, 80783}, + {334, 80861}, + {335, 80939}, + {336, 81017}, + {337, 81095}, + {338, 81173}, + {339, 81251}, + {340, 81329}, + {341, 81407}, + {342, 81485}, + {343, 81563}, + {344, 81641}, + {345, 81719}, + {346, 81797}, + {347, 81875}, + {348, 81953}, + {349, 82031}, + {350, 82109}, + {351, 82187}, + {352, 82265}, + {353, 82343}, + {354, 82421}, + {355, 82499}, + {356, 82577}, + {357, 82655}, + {358, 82733}, + {359, 82811}, + {360, 82889}, + {361, 82967}, + {362, 83045}, + {363, 83123}, + {364, 83201}, + {365, 83279}, + {366, 83357}, + {367, 83435}, + {368, 83513}, + {369, 83591}, + {370, 83669}, + {371, 83747}, + {372, 83825}, + {373, 83903}, + {374, 83981}, + {375, 84059}, + {376, 84137}, + {377, 84215}, + {378, 84293}, + {379, 84371}, + {380, 84449}, + {381, 84527}, + {382, 84605}, + {383, 84683}, + {384, 84761}, + {385, 84839}, + {386, 84917}, + {387, 84995}, + {388, 85073}, + {389, 85151}, + {390, 85229}, + {391, 85307}, + {392, 85385}, + {393, 85463}, + {394, 85541}, + {395, 85619}, + {396, 85697}, + {397, 85775}, + {398, 85853}, + {399, 85931}, + {400, 86009}, + {401, 86087}, + {402, 86165}, + {403, 86243}, + {404, 86321}, + {405, 86399}, + {406, 86477}, + {407, 86555}, + {408, 86633}, + {409, 86711}, + {410, 86789}, + {411, 86867}, + {412, 86945}, + {413, 87023}, + {414, 87101}, + {415, 87179}, + {416, 87257}, + {417, 87335}, + {418, 87413}, + {419, 87491}, + {420, 87569}, + {421, 87647}, + {422, 87725}, + {428, 88254}, + {429, 88352}, + {430, 88450}, + {431, 88548}, + {432, 88646}, + {433, 88744}, + {434, 88842}, + {435, 88940}, + {436, 89038}, + {437, 89136}, + {438, 89234}, + {439, 89332}, + {440, 89430}, + {441, 89528}, + {442, 89626}, + {443, 89724}, + {444, 89822}, + {445, 89920}, + {446, 90018}, + {447, 90116}, + {448, 90214}, + {449, 90312}, + {450, 90410}, + {451, 90508}, + {520, 98021}, + {521, 98105}, + {522, 98189}, + {523, 98273}, + {524, 98357}, + {525, 98441}, + {526, 98525}, + {527, 98609}, + {528, 98693}, + {529, 98777}, + {530, 98861}, + {531, 98945}, + {532, 99029}, + {533, 99113}, + {534, 99197}, + {535, 99281}, + {536, 99365}, + {537, 99449}, + {538, 99533}, + {539, 99617}, + {540, 99701}, + {541, 99785}, + {542, 99869}, + {543, 99953}, + {544, 100037}, + {545, 100121}, + {546, 100205}, + {547, 100289}, + {548, 100373}, + {549, 100457}, + {550, 100541}, + {551, 100625}, + {552, 100709}, + {553, 100793}, + {554, 100877}, + {555, 100961}, + {556, 101045}, + {557, 101129}, + {558, 101213}, + {559, 101297}, + {560, 101381}, + {561, 101465}, + {562, 101549}, + {563, 101633}, + {564, 101717}, + {565, 101801}, + {566, 101885}, + {567, 101969}, + {572, 102485}, + {573, 102744}, + {574, 103003}, + {575, 103262}, + {576, 103521}, + {577, 103780}, + {578, 104039}, + {579, 104298}, + {580, 104557}, + {581, 104816}, + {582, 105075}, + {583, 105334}, + {584, 105593}, + {585, 105852}, + {586, 106111}, + {587, 106370}, + {588, 106629}, + {589, 106888}, + {590, 107147}, + {591, 107406}, + {592, 107665}, + {593, 107924}, + {594, 108183}, + {595, 108442}, + {610, 110693}, + {611, 110794}, + {612, 110882}, + {613, 110970}, + {614, 111058}, + {615, 111146}, + {616, 111234}, + {617, 111322}, + {618, 111834}, + {619, 112346}, + {620, 112858}, + {621, 113370}, + {622, 113882}, + {623, 114394}, + {624, 114906}, + {625, 115418}, + {626, 115930}, + {627, 116442}, + {628, 116954}, + {629, 117466}, + {630, 117978}, + {631, 118490}, + {632, 119002}, + {633, 119514}, + {634, 120026}, + {635, 120538}, + {636, 121050}, + {637, 121562}, + {638, 122074}, + {639, 122586}, + {640, 123098}, + {641, 123610}, + {642, 124122}, + {643, 124634}, + {644, 125146}, + {645, 125658}, + {646, 126170}, + {647, 126682}, + {648, 127194}, + {649, 127706}, + {650, 128218}, + {651, 128730}, + {652, 129242}, + {653, 129754}, + {654, 130266}, + {655, 130778}, + {656, 131290}, + {657, 131802}, + {658, 132314}, + {659, 132826}, + {660, 133338}, + {661, 133850}, + {662, 134362}, + {663, 134874}, + {664, 135386}, + {665, 135898}, + {666, 136410}, + {667, 136922}, + {668, 137434}, + {669, 137946}, + {670, 138458}, + {671, 138970}, + {672, 139482}, + {673, 139994}, + {674, 140506}, + {675, 141018}, + {676, 141530}, + {677, 142042}, + {678, 142554}, + {679, 143066}, + {680, 143578}, + {681, 144090}, + {682, 144602}, + {683, 145114}, + {684, 145626}, + {685, 146138}, + {686, 146650}, + {687, 147162}, + {688, 147674}, + {689, 148186}, + {690, 148698}, + {691, 149210}, + {692, 149722}, + {693, 150234}, + {694, 150746}, + {695, 151258}, + {696, 151770}, + {697, 152282}, + {698, 152794}, + {699, 153306}, + {700, 153818}, + {701, 154330}, + {702, 154842}, + {703, 155354}, + {704, 155866}, + {705, 156378}, + {706, 156890}, + {707, 157402}, + {708, 157914}, + {709, 158426}, + {710, 158938}, + {711, 159450}, + {712, 159962}, + {713, 160474}, + {714, 160986}, + {715, 161498}, + {716, 162010}, + {717, 162522}, + {718, 163034}, + {719, 163546}, + {720, 164058}, + {721, 164570}, + {722, 165082}, + {723, 165594}, + {724, 166106}, + {725, 166618}, + {726, 167130}, + {727, 167642}, + {728, 168154}, + {729, 168666}, + {730, 169178}, + {731, 169690}, + {732, 170202}, + {733, 170714}, + {734, 171226}, + {735, 171738}, + {736, 172250}, + {737, 172762}, + {738, 173274}, + {739, 173786}, + {740, 174298}, + {741, 174810}, + {742, 175322}, + {743, 175834}, + {744, 176346}, + {745, 176858}, + {746, 177370}, + {747, 177882}, + {748, 178394}, + {749, 178906}, + {750, 179418}, + {751, 179930}, + {752, 180442}, + {753, 180954}, + {754, 181466}, + {755, 181978}, + {756, 182490}, + {757, 183002}, + {758, 183514}, + {759, 184026}, + {760, 184538}, + {761, 185050}, + {762, 185562}, + {763, 186074}, + {764, 186586}, + {765, 187098}, + {766, 187610}, + {767, 188122}, + {768, 188634}, + {769, 189146}, + {770, 189658}, + {771, 190170}, + {772, 190682}, + {773, 191194}, + {774, 191706}, + {775, 192218}, + {776, 192730}, + {777, 193242}, + {778, 193754}, + {779, 194266}, + {780, 194778}, + {781, 195290}, + {782, 195802}, + {783, 196314}, + {784, 196826}, + {785, 197338}, + {786, 197850}, + {787, 198362}, + {788, 198874}, + {789, 199386}, + {790, 199898}, + {791, 200410}, + {792, 200922}, + {793, 201434}, + {794, 201946}, + {795, 202458}, + {796, 202970}, + {797, 203482}, + {798, 203994}, + {799, 204506}, + {800, 205018}, + {801, 205530}, + {802, 206042}, + {803, 206554}, + {804, 207066}, + {805, 207578}, + {806, 208090}, + {807, 208602}, + {808, 209114}, + {809, 209626}, + {810, 210138}, + {811, 210650}, + {812, 211162}, + {813, 211674}, + {814, 212186}, + {815, 212698}, + {816, 213210}, + {817, 213722}, + {818, 214234}, + {819, 214746}, + {820, 215258}, + {821, 215770}, + {822, 216282}, + {823, 216794}, + {824, 217306}, + {825, 217818}, + {826, 218330}, + {827, 218842}, + {828, 219354}, + {829, 219866}, + {830, 220378}, + {831, 220890}, + {832, 221402}, + {833, 221914}, + {834, 222426}, + {835, 222938}, + {836, 223450}, + {837, 223962}, + {838, 224474}, + {839, 224986}, + {840, 225498}, + {841, 226010}, + {842, 226522}, + {843, 227034}, + {844, 227546}, + {845, 228058}, + {846, 228570}, + {847, 229082}, + {848, 229594}, + {849, 230106}, + {850, 230618}, + {851, 231130}, + {852, 231642}, + {853, 232154}, + {854, 232666}, + {855, 233178}, + {856, 233690}, + {858, 234203}, }; GpaPaddedCounterDesc kDx11PaddedCounterByGroupGfx11[] = { @@ -3846,7 +3846,6 @@ namespace counter_dx11_gfx11 const std::set kHwDx11TimestampBlockIdsGfx11 = {858, 857}; ///< Timestamp block id's for DX11 for gfx11 family const std::set kHwDx11TimeCounterIndicesGfx11 = {234203, 234204, 234205, 234206, 234207, 234208, 234202}; ///< Timestamp counter indices for DX11 for gfx11 family const unsigned int kHwDx11GroupCountGfx11 = static_cast(kHwDx11GroupsGfx11.size()); - const unsigned int kHwDx11ExposedCountersGroupCountGfx11 = 760; const unsigned int kDx11PaddedCounterGroupCountGfx11 = 0; const unsigned int kHwDx11SqGroupCountGfx11 = sizeof(kHwDx11SqGroupsGfx11) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx11SqIsolatedGroupCountGfx11 = sizeof(kHwDx11SqIsolatedGroupsGfx11) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.h index 8d55ea1b..13cf8845 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx11.h @@ -39,7 +39,6 @@ namespace counter_dx11_gfx11 extern const std::set kHwDx11TimestampBlockIdsGfx11; ///< Timestamp block id's for Dx11 for Gfx11 family extern const std::set kHwDx11TimeCounterIndicesGfx11; ///< Timestamp counter indices for Dx11 for Gfx11 family extern const unsigned int kHwDx11GroupCountGfx11; ///< Hardware Group Count for Dx11 for Gfx11 family - extern const unsigned int kHwDx11ExposedCountersGroupCountGfx11; ///< Exposed hardware counter Group Count for Dx11 for Gfx11 family extern const unsigned int kDx11PaddedCounterGroupCountGfx11; ///< reserved counter group count for Dx11 for Gfx11 family extern const unsigned int kHwDx11SqGroupCountGfx11; ///< Hardware SQ Group Count for Dx11 for Gfx11 family extern const unsigned int kHwDx11SqIsolatedGroupCountGfx11; ///< Hardware Isolated Group Count for Dx11 for Gfx11 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.cc index 0dbd8c7d..c2ef93ce 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.cc @@ -599,236 +599,236 @@ namespace counter_dx11_gfx8 }; GpaCounterGroupExposedCounterDesc kHwDx11ExposedCountersByGroupGfx8[] = { - {4, 170, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 566, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {6, 962, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {7, 1358, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {8, 1754, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {9, 2150, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {10, 2546, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {11, 2942, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {12, 3338, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {13, 3734, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {14, 4130, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {15, 4526, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {16, 4922, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {17, 5318, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {18, 5714, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {19, 6110, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {20, 6506, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {21, 6763, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {22, 7020, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {23, 7277, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {24, 7534, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {25, 7791, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {26, 8048, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {27, 8305, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {28, 8562, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {29, 8819, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {30, 9076, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {31, 9333, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {32, 9590, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {33, 9847, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {34, 10104, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {35, 10361, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {36, 10618, {0, 2}}, - {42, 10719, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {43, 10872, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {44, 11025, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {45, 11178, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {46, 11331, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {47, 11728, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {48, 12125, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {49, 12522, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {50, 12919, {12, 14, 17, 19, 22, 24, 27, 29}}, - {51, 12953, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 12987, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 13021, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 13055, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {55, 13252, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {56, 13449, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {57, 13646, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {58, 13843, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {59, 14142, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {60, 14441, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {61, 14740, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {62, 15039, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {63, 15338, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {64, 15637, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {65, 15936, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {66, 16235, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {67, 16534, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {68, 16833, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {69, 17132, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {70, 17431, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {71, 17730, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {72, 18029, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {73, 18328, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {74, 18627, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {75, 18926, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {76, 19225, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {77, 19524, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {78, 19823, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {79, 20122, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {80, 20421, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {81, 20720, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {82, 21019, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {83, 21318, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {84, 21617, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {85, 21916, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {86, 22215, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {87, 22514, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {88, 22813, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {89, 23112, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {90, 23411, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 23530, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 23649, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 23768, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 23887, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 24006, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 24125, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 24244, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 24363, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 24482, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 24601, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 24720, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 24839, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 24958, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 25077, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 25196, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 25315, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 25434, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 25553, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 25672, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 25791, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 25910, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 26029, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 26148, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 26267, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 26386, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 26505, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 26624, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 26743, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {119, 26862, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {120, 26981, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {121, 27100, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {122, 27219, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {123, 27338, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {124, 27457, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {125, 27576, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {126, 27695, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {127, 27814, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {128, 27933, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {129, 28052, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {130, 28171, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {131, 28290, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {132, 28409, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {133, 28528, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {134, 28647, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {135, 28766, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {136, 28885, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {137, 29004, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {138, 29123, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {139, 29242, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {140, 29361, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {141, 29480, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {142, 29599, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {143, 29718, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {144, 29837, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {145, 29956, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {146, 30075, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {147, 30194, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {148, 30313, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {149, 30432, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {150, 30551, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {151, 30670, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {152, 30789, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {153, 30908, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {218, 34547, {3, 7, 8, 9}}, - {219, 34727, {3, 7, 8, 9}}, - {220, 34907, {3, 7, 8, 9}}, - {221, 35087, {3, 7, 8, 9}}, - {222, 35267, {3, 7, 8, 9}}, - {223, 35447, {3, 7, 8, 9}}, - {224, 35627, {3, 7, 8, 9}}, - {225, 35807, {3, 7, 8, 9}}, - {226, 35987, {3, 7, 8, 9}}, - {227, 36167, {3, 7, 8, 9}}, - {228, 36347, {3, 7, 8, 9}}, - {229, 36527, {3, 7, 8, 9}}, - {230, 36707, {3, 7, 8, 9}}, - {231, 36887, {3, 7, 8, 9}}, - {232, 37067, {3, 7, 8, 9}}, - {233, 37247, {3, 7, 8, 9}}, - {234, 37427, {3, 7, 8, 9}}, - {235, 37607, {3, 7, 8, 9}}, - {236, 37787, {3, 7, 8, 9}}, - {237, 37967, {3, 7, 8, 9}}, - {238, 38147, {3, 7, 8, 9}}, - {239, 38327, {3, 7, 8, 9}}, - {240, 38507, {3, 7, 8, 9}}, - {241, 38687, {3, 7, 8, 9}}, - {242, 38867, {3, 7, 8, 9}}, - {243, 39047, {3, 7, 8, 9}}, - {244, 39227, {3, 7, 8, 9}}, - {245, 39407, {3, 7, 8, 9}}, - {246, 39587, {3, 7, 8, 9}}, - {247, 39767, {3, 7, 8, 9}}, - {248, 39947, {3, 7, 8, 9}}, - {249, 40127, {3, 7, 8, 9}}, - {250, 40307, {3, 7, 8, 9}}, - {251, 40487, {3, 7, 8, 9}}, - {252, 40667, {3, 7, 8, 9}}, - {253, 40847, {3, 7, 8, 9}}, - {254, 41027, {3, 7, 8, 9}}, - {255, 41207, {3, 7, 8, 9}}, - {256, 41387, {3, 7, 8, 9}}, - {257, 41567, {3, 7, 8, 9}}, - {258, 41747, {3, 7, 8, 9}}, - {259, 41927, {3, 7, 8, 9}}, - {260, 42107, {3, 7, 8, 9}}, - {261, 42287, {3, 7, 8, 9}}, - {262, 42467, {3, 7, 8, 9}}, - {263, 42647, {3, 7, 8, 9}}, - {264, 42827, {3, 7, 8, 9}}, - {265, 43007, {3, 7, 8, 9}}, - {266, 43187, {3, 7, 8, 9}}, - {267, 43367, {3, 7, 8, 9}}, - {268, 43547, {3, 7, 8, 9}}, - {269, 43727, {3, 7, 8, 9}}, - {270, 43907, {3, 7, 8, 9}}, - {271, 44087, {3, 7, 8, 9}}, - {272, 44267, {3, 7, 8, 9}}, - {273, 44447, {3, 7, 8, 9}}, - {274, 44627, {3, 7, 8, 9}}, - {275, 44807, {3, 7, 8, 9}}, - {276, 44987, {3, 7, 8, 9}}, - {277, 45167, {3, 7, 8, 9}}, - {278, 45347, {3, 7, 8, 9}}, - {279, 45527, {3, 7, 8, 9}}, - {280, 45707, {3, 7, 8, 9}}, - {281, 45887, {3, 7, 8, 9}}, - {282, 46067, {18, 19, 26, 28, 35}}, - {283, 46259, {18, 19, 26, 28, 35}}, - {284, 46451, {18, 19, 26, 28, 35}}, - {285, 46643, {18, 19, 26, 28, 35}}, - {286, 46835, {18, 19, 26, 28, 35}}, - {287, 47027, {18, 19, 26, 28, 35}}, - {288, 47219, {18, 19, 26, 28, 35}}, - {289, 47411, {18, 19, 26, 28, 35}}, - {290, 47603, {18, 19, 26, 28, 35}}, - {291, 47795, {18, 19, 26, 28, 35}}, - {292, 47987, {18, 19, 26, 28, 35}}, - {293, 48179, {18, 19, 26, 28, 35}}, - {294, 48371, {18, 19, 26, 28, 35}}, - {295, 48563, {18, 19, 26, 28, 35}}, - {296, 48755, {18, 19, 26, 28, 35}}, - {297, 48947, {18, 19, 26, 28, 35}}, - {303, 49378, {1, 9, 20, 96, 105, 124}}, - {304, 49525, {1, 9, 20, 96, 105, 124}}, - {305, 49672, {1, 9, 20, 96, 105, 124}}, - {306, 49819, {1, 9, 20, 96, 105, 124}}, - {343, 51132, {0, 1, 2, 3, 4, 5}}, + {4, 170}, + {5, 566}, + {6, 962}, + {7, 1358}, + {8, 1754}, + {9, 2150}, + {10, 2546}, + {11, 2942}, + {12, 3338}, + {13, 3734}, + {14, 4130}, + {15, 4526}, + {16, 4922}, + {17, 5318}, + {18, 5714}, + {19, 6110}, + {20, 6506}, + {21, 6763}, + {22, 7020}, + {23, 7277}, + {24, 7534}, + {25, 7791}, + {26, 8048}, + {27, 8305}, + {28, 8562}, + {29, 8819}, + {30, 9076}, + {31, 9333}, + {32, 9590}, + {33, 9847}, + {34, 10104}, + {35, 10361}, + {36, 10618}, + {42, 10719}, + {43, 10872}, + {44, 11025}, + {45, 11178}, + {46, 11331}, + {47, 11728}, + {48, 12125}, + {49, 12522}, + {50, 12919}, + {51, 12953}, + {52, 12987}, + {53, 13021}, + {54, 13055}, + {55, 13252}, + {56, 13449}, + {57, 13646}, + {58, 13843}, + {59, 14142}, + {60, 14441}, + {61, 14740}, + {62, 15039}, + {63, 15338}, + {64, 15637}, + {65, 15936}, + {66, 16235}, + {67, 16534}, + {68, 16833}, + {69, 17132}, + {70, 17431}, + {71, 17730}, + {72, 18029}, + {73, 18328}, + {74, 18627}, + {75, 18926}, + {76, 19225}, + {77, 19524}, + {78, 19823}, + {79, 20122}, + {80, 20421}, + {81, 20720}, + {82, 21019}, + {83, 21318}, + {84, 21617}, + {85, 21916}, + {86, 22215}, + {87, 22514}, + {88, 22813}, + {89, 23112}, + {90, 23411}, + {91, 23530}, + {92, 23649}, + {93, 23768}, + {94, 23887}, + {95, 24006}, + {96, 24125}, + {97, 24244}, + {98, 24363}, + {99, 24482}, + {100, 24601}, + {101, 24720}, + {102, 24839}, + {103, 24958}, + {104, 25077}, + {105, 25196}, + {106, 25315}, + {107, 25434}, + {108, 25553}, + {109, 25672}, + {110, 25791}, + {111, 25910}, + {112, 26029}, + {113, 26148}, + {114, 26267}, + {115, 26386}, + {116, 26505}, + {117, 26624}, + {118, 26743}, + {119, 26862}, + {120, 26981}, + {121, 27100}, + {122, 27219}, + {123, 27338}, + {124, 27457}, + {125, 27576}, + {126, 27695}, + {127, 27814}, + {128, 27933}, + {129, 28052}, + {130, 28171}, + {131, 28290}, + {132, 28409}, + {133, 28528}, + {134, 28647}, + {135, 28766}, + {136, 28885}, + {137, 29004}, + {138, 29123}, + {139, 29242}, + {140, 29361}, + {141, 29480}, + {142, 29599}, + {143, 29718}, + {144, 29837}, + {145, 29956}, + {146, 30075}, + {147, 30194}, + {148, 30313}, + {149, 30432}, + {150, 30551}, + {151, 30670}, + {152, 30789}, + {153, 30908}, + {218, 34547}, + {219, 34727}, + {220, 34907}, + {221, 35087}, + {222, 35267}, + {223, 35447}, + {224, 35627}, + {225, 35807}, + {226, 35987}, + {227, 36167}, + {228, 36347}, + {229, 36527}, + {230, 36707}, + {231, 36887}, + {232, 37067}, + {233, 37247}, + {234, 37427}, + {235, 37607}, + {236, 37787}, + {237, 37967}, + {238, 38147}, + {239, 38327}, + {240, 38507}, + {241, 38687}, + {242, 38867}, + {243, 39047}, + {244, 39227}, + {245, 39407}, + {246, 39587}, + {247, 39767}, + {248, 39947}, + {249, 40127}, + {250, 40307}, + {251, 40487}, + {252, 40667}, + {253, 40847}, + {254, 41027}, + {255, 41207}, + {256, 41387}, + {257, 41567}, + {258, 41747}, + {259, 41927}, + {260, 42107}, + {261, 42287}, + {262, 42467}, + {263, 42647}, + {264, 42827}, + {265, 43007}, + {266, 43187}, + {267, 43367}, + {268, 43547}, + {269, 43727}, + {270, 43907}, + {271, 44087}, + {272, 44267}, + {273, 44447}, + {274, 44627}, + {275, 44807}, + {276, 44987}, + {277, 45167}, + {278, 45347}, + {279, 45527}, + {280, 45707}, + {281, 45887}, + {282, 46067}, + {283, 46259}, + {284, 46451}, + {285, 46643}, + {286, 46835}, + {287, 47027}, + {288, 47219}, + {289, 47411}, + {290, 47603}, + {291, 47795}, + {292, 47987}, + {293, 48179}, + {294, 48371}, + {295, 48563}, + {296, 48755}, + {297, 48947}, + {303, 49378}, + {304, 49525}, + {305, 49672}, + {306, 49819}, + {343, 51132}, }; GpaPaddedCounterDesc kDx11PaddedCounterByGroupGfx8[] = { @@ -1440,7 +1440,6 @@ namespace counter_dx11_gfx8 const std::set kHwDx11TimestampBlockIdsGfx8 = {343, 342}; ///< Timestamp block id's for DX11 for gfx8 family const std::set kHwDx11TimeCounterIndicesGfx8 = {51132, 51133, 51134, 51135, 51136, 51137, 51131}; ///< Timestamp counter indices for DX11 for gfx8 family const unsigned int kHwDx11GroupCountGfx8 = static_cast(kHwDx11GroupsGfx8.size()); - const unsigned int kHwDx11ExposedCountersGroupCountGfx8 = 230; const unsigned int kDx11PaddedCounterGroupCountGfx8 = 0; const unsigned int kHwDx11SqGroupCountGfx8 = sizeof(kHwDx11SqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx11SqIsolatedGroupCountGfx8 = sizeof(kHwDx11SqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.h index 399cd57c..4e1afc8f 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx8.h @@ -39,7 +39,6 @@ namespace counter_dx11_gfx8 extern const std::set kHwDx11TimestampBlockIdsGfx8; ///< Timestamp block id's for Dx11 for Gfx8 family extern const std::set kHwDx11TimeCounterIndicesGfx8; ///< Timestamp counter indices for Dx11 for Gfx8 family extern const unsigned int kHwDx11GroupCountGfx8; ///< Hardware Group Count for Dx11 for Gfx8 family - extern const unsigned int kHwDx11ExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Dx11 for Gfx8 family extern const unsigned int kDx11PaddedCounterGroupCountGfx8; ///< reserved counter group count for Dx11 for Gfx8 family extern const unsigned int kHwDx11SqGroupCountGfx8; ///< Hardware SQ Group Count for Dx11 for Gfx8 family extern const unsigned int kHwDx11SqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Dx11 for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.cc index 82e76157..12adde02 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.cc @@ -641,269 +641,269 @@ namespace counter_dx11_gfx9 }; GpaCounterGroupExposedCounterDesc kHwDx11ExposedCountersByGroupGfx9[] = { - {0, 0, {0, 23}}, - {1, 32, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 476, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 920, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1364, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 1808, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {6, 2252, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {7, 2696, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {8, 3140, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {9, 3584, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {10, 4028, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {11, 4472, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {12, 4916, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {13, 5360, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {14, 5804, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {15, 6248, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {16, 6692, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {17, 7136, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {18, 7464, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {19, 7792, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {20, 8120, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {21, 8448, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {22, 8776, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {23, 9104, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {24, 9432, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {25, 9760, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {26, 10088, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {27, 10416, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {28, 10744, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {29, 11072, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {30, 11400, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {31, 11728, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {32, 12056, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {33, 12384, {0, 2}}, - {39, 12493, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {40, 12844, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {41, 13195, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {42, 13546, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {43, 13897, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {44, 14389, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {45, 14881, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {46, 15373, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {47, 15865, {12, 14, 17, 19, 22, 24, 27, 29}}, - {48, 16073, {12, 14, 17, 19, 22, 24, 27, 29}}, - {49, 16281, {12, 14, 17, 19, 22, 24, 27, 29}}, - {50, 16489, {12, 14, 17, 19, 22, 24, 27, 29}}, - {51, 16697, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {52, 16893, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {53, 17089, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {54, 17285, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {55, 17481, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {56, 17855, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {57, 18229, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {58, 18603, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {59, 18977, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {60, 19351, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {61, 19725, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {62, 20099, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {63, 20473, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {64, 20847, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {65, 21221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {66, 21595, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {67, 21969, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {68, 22343, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {69, 22717, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {70, 23091, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {71, 23465, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {72, 23839, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {73, 24213, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {74, 24587, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {75, 24961, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {76, 25335, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {77, 25709, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {78, 26083, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {79, 26457, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {80, 26831, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {81, 27205, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {82, 27579, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {83, 27953, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {84, 28327, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {85, 28701, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {86, 29075, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {87, 29449, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 29568, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 29687, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 29806, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 29925, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 30044, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 30163, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 30282, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 30401, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 30520, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 30639, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 30758, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 30877, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 30996, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 31115, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 31234, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 31353, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 31472, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 31591, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 31710, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 31829, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 31948, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 32067, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 32186, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 32305, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 32424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 32543, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 32662, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 32781, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 32900, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 33019, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 33138, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {119, 33257, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {120, 33376, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {121, 33495, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {122, 33614, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {123, 33733, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {124, 33852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {125, 33971, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {126, 34090, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {127, 34209, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {128, 34328, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {129, 34447, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {130, 34566, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {131, 34685, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {132, 34804, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {133, 34923, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {134, 35042, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {135, 35161, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {136, 35280, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {137, 35399, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {138, 35518, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {139, 35637, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {140, 35756, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {141, 35875, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {142, 35994, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {143, 36113, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {144, 36232, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {145, 36351, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {146, 36470, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {147, 36589, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {148, 36708, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {149, 36827, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {150, 36946, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {215, 40713, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {216, 40798, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {217, 40883, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {218, 40968, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {219, 41053, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {220, 41138, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {221, 41223, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {222, 41308, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {223, 41393, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {224, 41478, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {225, 41563, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {226, 41648, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {227, 41733, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {228, 41818, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {229, 41903, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {230, 41988, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {231, 42073, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {232, 42158, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {233, 42243, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {234, 42328, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {235, 42413, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {236, 42498, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {237, 42583, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {238, 42668, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {239, 42753, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {240, 42838, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {241, 42923, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {242, 43008, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {243, 43093, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {244, 43178, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {245, 43263, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {246, 43348, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {247, 43433, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {248, 43518, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {249, 43603, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {250, 43688, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {251, 43773, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {252, 43858, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {253, 43943, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {254, 44028, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {255, 44113, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {256, 44198, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {257, 44283, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {258, 44368, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {259, 44453, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {260, 44538, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {261, 44623, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {262, 44708, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {263, 44793, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {264, 44878, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {265, 44963, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {266, 45048, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {267, 45133, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {268, 45218, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {269, 45303, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {270, 45388, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {271, 45473, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {272, 45558, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {273, 45643, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {274, 45728, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {275, 45813, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {276, 45898, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {277, 45983, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {278, 46068, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {279, 46153, {20, 22, 29, 30, 33, 41, 42}}, - {280, 46435, {20, 22, 29, 30, 33, 41, 42}}, - {281, 46717, {20, 22, 29, 30, 33, 41, 42}}, - {282, 46999, {20, 22, 29, 30, 33, 41, 42}}, - {283, 47281, {20, 22, 29, 30, 33, 41, 42}}, - {284, 47563, {20, 22, 29, 30, 33, 41, 42}}, - {285, 47845, {20, 22, 29, 30, 33, 41, 42}}, - {286, 48127, {20, 22, 29, 30, 33, 41, 42}}, - {287, 48409, {20, 22, 29, 30, 33, 41, 42}}, - {288, 48691, {20, 22, 29, 30, 33, 41, 42}}, - {289, 48973, {20, 22, 29, 30, 33, 41, 42}}, - {290, 49255, {20, 22, 29, 30, 33, 41, 42}}, - {291, 49537, {20, 22, 29, 30, 33, 41, 42}}, - {292, 49819, {20, 22, 29, 30, 33, 41, 42}}, - {293, 50101, {20, 22, 29, 30, 33, 41, 42}}, - {294, 50383, {20, 22, 29, 30, 33, 41, 42}}, - {300, 50920, {1, 9, 105, 114, 125, 146}}, - {301, 51068, {1, 9, 105, 114, 125, 146}}, - {302, 51216, {1, 9, 105, 114, 125, 146}}, - {303, 51364, {1, 9, 105, 114, 125, 146}}, - {311, 51813, {55, 57}}, - {312, 51896, {55, 57}}, - {313, 51979, {55, 57}}, - {314, 52062, {55, 57}}, - {315, 52145, {55, 57}}, - {316, 52228, {55, 57}}, - {317, 52311, {55, 57}}, - {318, 52394, {55, 57}}, - {319, 52477, {55, 57}}, - {320, 52560, {55, 57}}, - {321, 52643, {55, 57}}, - {322, 52726, {55, 57}}, - {323, 52809, {55, 57}}, - {324, 52892, {55, 57}}, - {325, 52975, {55, 57}}, - {326, 53058, {55, 57}}, - {327, 53141, {55, 57}}, - {328, 53224, {55, 57}}, - {329, 53307, {55, 57}}, - {330, 53390, {55, 57}}, - {331, 53473, {55, 57}}, - {332, 53556, {55, 57}}, - {333, 53639, {55, 57}}, - {334, 53722, {55, 57}}, - {335, 53805, {55, 57}}, - {336, 53888, {55, 57}}, - {337, 53971, {55, 57}}, - {338, 54054, {55, 57}}, - {339, 54137, {55, 57}}, - {340, 54220, {55, 57}}, - {341, 54303, {55, 57}}, - {342, 54386, {55, 57}}, - {352, 56526, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 32}, + {2, 476}, + {3, 920}, + {4, 1364}, + {5, 1808}, + {6, 2252}, + {7, 2696}, + {8, 3140}, + {9, 3584}, + {10, 4028}, + {11, 4472}, + {12, 4916}, + {13, 5360}, + {14, 5804}, + {15, 6248}, + {16, 6692}, + {17, 7136}, + {18, 7464}, + {19, 7792}, + {20, 8120}, + {21, 8448}, + {22, 8776}, + {23, 9104}, + {24, 9432}, + {25, 9760}, + {26, 10088}, + {27, 10416}, + {28, 10744}, + {29, 11072}, + {30, 11400}, + {31, 11728}, + {32, 12056}, + {33, 12384}, + {39, 12493}, + {40, 12844}, + {41, 13195}, + {42, 13546}, + {43, 13897}, + {44, 14389}, + {45, 14881}, + {46, 15373}, + {47, 15865}, + {48, 16073}, + {49, 16281}, + {50, 16489}, + {51, 16697}, + {52, 16893}, + {53, 17089}, + {54, 17285}, + {55, 17481}, + {56, 17855}, + {57, 18229}, + {58, 18603}, + {59, 18977}, + {60, 19351}, + {61, 19725}, + {62, 20099}, + {63, 20473}, + {64, 20847}, + {65, 21221}, + {66, 21595}, + {67, 21969}, + {68, 22343}, + {69, 22717}, + {70, 23091}, + {71, 23465}, + {72, 23839}, + {73, 24213}, + {74, 24587}, + {75, 24961}, + {76, 25335}, + {77, 25709}, + {78, 26083}, + {79, 26457}, + {80, 26831}, + {81, 27205}, + {82, 27579}, + {83, 27953}, + {84, 28327}, + {85, 28701}, + {86, 29075}, + {87, 29449}, + {88, 29568}, + {89, 29687}, + {90, 29806}, + {91, 29925}, + {92, 30044}, + {93, 30163}, + {94, 30282}, + {95, 30401}, + {96, 30520}, + {97, 30639}, + {98, 30758}, + {99, 30877}, + {100, 30996}, + {101, 31115}, + {102, 31234}, + {103, 31353}, + {104, 31472}, + {105, 31591}, + {106, 31710}, + {107, 31829}, + {108, 31948}, + {109, 32067}, + {110, 32186}, + {111, 32305}, + {112, 32424}, + {113, 32543}, + {114, 32662}, + {115, 32781}, + {116, 32900}, + {117, 33019}, + {118, 33138}, + {119, 33257}, + {120, 33376}, + {121, 33495}, + {122, 33614}, + {123, 33733}, + {124, 33852}, + {125, 33971}, + {126, 34090}, + {127, 34209}, + {128, 34328}, + {129, 34447}, + {130, 34566}, + {131, 34685}, + {132, 34804}, + {133, 34923}, + {134, 35042}, + {135, 35161}, + {136, 35280}, + {137, 35399}, + {138, 35518}, + {139, 35637}, + {140, 35756}, + {141, 35875}, + {142, 35994}, + {143, 36113}, + {144, 36232}, + {145, 36351}, + {146, 36470}, + {147, 36589}, + {148, 36708}, + {149, 36827}, + {150, 36946}, + {215, 40713}, + {216, 40798}, + {217, 40883}, + {218, 40968}, + {219, 41053}, + {220, 41138}, + {221, 41223}, + {222, 41308}, + {223, 41393}, + {224, 41478}, + {225, 41563}, + {226, 41648}, + {227, 41733}, + {228, 41818}, + {229, 41903}, + {230, 41988}, + {231, 42073}, + {232, 42158}, + {233, 42243}, + {234, 42328}, + {235, 42413}, + {236, 42498}, + {237, 42583}, + {238, 42668}, + {239, 42753}, + {240, 42838}, + {241, 42923}, + {242, 43008}, + {243, 43093}, + {244, 43178}, + {245, 43263}, + {246, 43348}, + {247, 43433}, + {248, 43518}, + {249, 43603}, + {250, 43688}, + {251, 43773}, + {252, 43858}, + {253, 43943}, + {254, 44028}, + {255, 44113}, + {256, 44198}, + {257, 44283}, + {258, 44368}, + {259, 44453}, + {260, 44538}, + {261, 44623}, + {262, 44708}, + {263, 44793}, + {264, 44878}, + {265, 44963}, + {266, 45048}, + {267, 45133}, + {268, 45218}, + {269, 45303}, + {270, 45388}, + {271, 45473}, + {272, 45558}, + {273, 45643}, + {274, 45728}, + {275, 45813}, + {276, 45898}, + {277, 45983}, + {278, 46068}, + {279, 46153}, + {280, 46435}, + {281, 46717}, + {282, 46999}, + {283, 47281}, + {284, 47563}, + {285, 47845}, + {286, 48127}, + {287, 48409}, + {288, 48691}, + {289, 48973}, + {290, 49255}, + {291, 49537}, + {292, 49819}, + {293, 50101}, + {294, 50383}, + {300, 50920}, + {301, 51068}, + {302, 51216}, + {303, 51364}, + {311, 51813}, + {312, 51896}, + {313, 51979}, + {314, 52062}, + {315, 52145}, + {316, 52228}, + {317, 52311}, + {318, 52394}, + {319, 52477}, + {320, 52560}, + {321, 52643}, + {322, 52726}, + {323, 52809}, + {324, 52892}, + {325, 52975}, + {326, 53058}, + {327, 53141}, + {328, 53224}, + {329, 53307}, + {330, 53390}, + {331, 53473}, + {332, 53556}, + {333, 53639}, + {334, 53722}, + {335, 53805}, + {336, 53888}, + {337, 53971}, + {338, 54054}, + {339, 54137}, + {340, 54220}, + {341, 54303}, + {342, 54386}, + {352, 56526}, }; GpaPaddedCounterDesc kDx11PaddedCounterByGroupGfx9[] = { @@ -1596,7 +1596,6 @@ namespace counter_dx11_gfx9 const std::set kHwDx11TimestampBlockIdsGfx9 = {352, 351}; ///< Timestamp block id's for DX11 for gfx9 family const std::set kHwDx11TimeCounterIndicesGfx9 = {56526, 56527, 56528, 56529, 56530, 56531, 56525}; ///< Timestamp counter indices for DX11 for gfx9 family const unsigned int kHwDx11GroupCountGfx9 = static_cast(kHwDx11GroupsGfx9.size()); - const unsigned int kHwDx11ExposedCountersGroupCountGfx9 = 263; const unsigned int kDx11PaddedCounterGroupCountGfx9 = 73; const unsigned int kHwDx11SqGroupCountGfx9 = sizeof(kHwDx11SqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx11SqIsolatedGroupCountGfx9 = sizeof(kHwDx11SqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.h index 6a319ce5..dbfb2c8f 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx11_gfx9.h @@ -39,7 +39,6 @@ namespace counter_dx11_gfx9 extern const std::set kHwDx11TimestampBlockIdsGfx9; ///< Timestamp block id's for Dx11 for Gfx9 family extern const std::set kHwDx11TimeCounterIndicesGfx9; ///< Timestamp counter indices for Dx11 for Gfx9 family extern const unsigned int kHwDx11GroupCountGfx9; ///< Hardware Group Count for Dx11 for Gfx9 family - extern const unsigned int kHwDx11ExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Dx11 for Gfx9 family extern const unsigned int kDx11PaddedCounterGroupCountGfx9; ///< reserved counter group count for Dx11 for Gfx9 family extern const unsigned int kHwDx11SqGroupCountGfx9; ///< Hardware SQ Group Count for Dx11 for Gfx9 family extern const unsigned int kHwDx11SqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Dx11 for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12.cmake index e03d8ef3..5ad50bbb 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS_DX12 diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.cc index 4cbddef7..51f9f77a 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.cc @@ -566,212 +566,212 @@ namespace counter_dx12_gfx10 }; GpaCounterGroupExposedCounterDesc kHwDx12ExposedCountersByGroupGfx10[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 306, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 572, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 838, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1104, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1656, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2208, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2760, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3312, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 3864, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4416, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 4968, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5520, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {14, 5849, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 6178, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 6690, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 7202, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 7714, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 8226, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 8738, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 9250, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 9762, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 10274, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {24, 10786, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {25, 11298, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 11810, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12322, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 12834, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13346, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 13858, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14370, {12, 14, 17, 19, 22, 24, 27, 29}}, - {32, 14595, {12, 14, 17, 19, 22, 24, 27, 29}}, - {33, 14820, {12, 14, 17, 19, 22, 24, 27, 29}}, - {34, 15045, {12, 14, 17, 19, 22, 24, 27, 29}}, - {35, 15270, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 15496, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 15722, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 15948, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {39, 16174, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {40, 16400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 16626, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {42, 16852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {43, 17078, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {44, 17304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {45, 17530, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {46, 17756, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {47, 17982, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {48, 18208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {49, 18434, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {50, 18660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {51, 18886, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {52, 19112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {53, 19338, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {54, 19564, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {55, 19790, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 20016, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 20242, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 20468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 20694, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 20920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 21146, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 21372, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 21598, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 21824, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 22050, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 22276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 22502, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 22728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 22954, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 23180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 23406, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 23632, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 23858, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 24084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 26750, {9, 18, 36, 44, 45, 46}}, - {116, 26827, {9, 18, 36, 44, 45, 46}}, - {117, 26904, {9, 18, 36, 44, 45, 46}}, - {118, 26981, {9, 18, 36, 44, 45, 46}}, - {119, 27058, {9, 18, 36, 44, 45, 46}}, - {120, 27135, {9, 18, 36, 44, 45, 46}}, - {121, 27212, {9, 18, 36, 44, 45, 46}}, - {122, 27289, {9, 18, 36, 44, 45, 46}}, - {123, 27366, {9, 18, 36, 44, 45, 46}}, - {124, 27443, {9, 18, 36, 44, 45, 46}}, - {125, 27520, {9, 18, 36, 44, 45, 46}}, - {126, 27597, {9, 18, 36, 44, 45, 46}}, - {127, 27674, {9, 18, 36, 44, 45, 46}}, - {128, 27751, {9, 18, 36, 44, 45, 46}}, - {129, 27828, {9, 18, 36, 44, 45, 46}}, - {130, 27905, {9, 18, 36, 44, 45, 46}}, - {131, 27982, {9, 18, 36, 44, 45, 46}}, - {132, 28059, {9, 18, 36, 44, 45, 46}}, - {133, 28136, {9, 18, 36, 44, 45, 46}}, - {134, 28213, {9, 18, 36, 44, 45, 46}}, - {135, 28290, {9, 18, 36, 44, 45, 46}}, - {136, 28367, {9, 18, 36, 44, 45, 46}}, - {137, 28444, {9, 18, 36, 44, 45, 46}}, - {138, 28521, {9, 18, 36, 44, 45, 46}}, - {139, 28598, {9, 18, 36, 44, 45, 46}}, - {140, 28675, {9, 18, 36, 44, 45, 46}}, - {141, 28752, {9, 18, 36, 44, 45, 46}}, - {142, 28829, {9, 18, 36, 44, 45, 46}}, - {143, 28906, {9, 18, 36, 44, 45, 46}}, - {144, 28983, {9, 18, 36, 44, 45, 46}}, - {145, 29060, {9, 18, 36, 44, 45, 46}}, - {146, 29137, {9, 18, 36, 44, 45, 46}}, - {147, 29214, {9, 18, 36, 44, 45, 46}}, - {148, 29291, {9, 18, 36, 44, 45, 46}}, - {149, 29368, {9, 18, 36, 44, 45, 46}}, - {150, 29445, {9, 18, 36, 44, 45, 46}}, - {151, 29522, {9, 18, 36, 44, 45, 46}}, - {152, 29599, {9, 18, 36, 44, 45, 46}}, - {153, 29676, {9, 18, 36, 44, 45, 46}}, - {154, 29753, {9, 18, 36, 44, 45, 46}}, - {155, 29830, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {156, 30200, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {157, 30570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {158, 30940, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {159, 31310, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {160, 31680, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {161, 32050, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {162, 32420, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {163, 32790, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {164, 33160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {165, 33530, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {166, 33900, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {167, 34270, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {168, 34640, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {169, 35010, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {170, 35380, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {171, 35750, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {172, 36211, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {173, 36672, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {174, 37133, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {175, 37594, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {176, 38055, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {177, 38516, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {178, 38977, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {179, 39438, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {180, 39899, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {181, 40360, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {182, 40821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {183, 41282, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {184, 41743, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {185, 42204, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {186, 42665, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {188, 43249, {0, 2}}, - {199, 43729, {55, 57}}, - {200, 43818, {55, 57}}, - {201, 43907, {55, 57}}, - {202, 43996, {55, 57}}, - {203, 44085, {55, 57}}, - {204, 44174, {55, 57}}, - {205, 44263, {55, 57}}, - {206, 44352, {55, 57}}, - {207, 44441, {55, 57}}, - {208, 44530, {55, 57}}, - {209, 44619, {55, 57}}, - {210, 44708, {55, 57}}, - {211, 44797, {55, 57}}, - {212, 44886, {55, 57}}, - {213, 44975, {55, 57}}, - {214, 45064, {55, 57}}, - {252, 50144, {211, 221, 227, 247, 275}}, - {261, 50747, {14, 18}}, - {262, 50811, {14, 18}}, - {263, 50875, {14, 18}}, - {264, 50939, {14, 18}}, - {265, 51003, {14, 18}}, - {266, 51067, {14, 18}}, - {267, 51131, {14, 18}}, - {268, 51195, {14, 18}}, - {269, 51259, {14, 18}}, - {270, 51323, {14, 18}}, - {271, 51387, {14, 18}}, - {272, 51451, {14, 18}}, - {273, 51515, {14, 18}}, - {274, 51579, {14, 18}}, - {275, 51643, {14, 18}}, - {276, 51707, {14, 18}}, - {297, 52743, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {298, 52978, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {299, 53213, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {300, 53448, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {301, 53683, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {302, 53918, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {303, 54153, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {304, 54388, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {305, 54623, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {306, 54858, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {307, 55093, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {308, 55328, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {309, 55563, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {310, 55798, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {311, 56033, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {312, 56268, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {313, 56503, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {314, 56738, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {315, 56973, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {316, 57208, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {317, 57443, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {318, 57678, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {319, 57913, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {320, 58148, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {334, 59893, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 306}, + {3, 572}, + {4, 838}, + {5, 1104}, + {6, 1656}, + {7, 2208}, + {8, 2760}, + {9, 3312}, + {10, 3864}, + {11, 4416}, + {12, 4968}, + {13, 5520}, + {14, 5849}, + {15, 6178}, + {16, 6690}, + {17, 7202}, + {18, 7714}, + {19, 8226}, + {20, 8738}, + {21, 9250}, + {22, 9762}, + {23, 10274}, + {24, 10786}, + {25, 11298}, + {26, 11810}, + {27, 12322}, + {28, 12834}, + {29, 13346}, + {30, 13858}, + {31, 14370}, + {32, 14595}, + {33, 14820}, + {34, 15045}, + {35, 15270}, + {36, 15496}, + {37, 15722}, + {38, 15948}, + {39, 16174}, + {40, 16400}, + {41, 16626}, + {42, 16852}, + {43, 17078}, + {44, 17304}, + {45, 17530}, + {46, 17756}, + {47, 17982}, + {48, 18208}, + {49, 18434}, + {50, 18660}, + {51, 18886}, + {52, 19112}, + {53, 19338}, + {54, 19564}, + {55, 19790}, + {56, 20016}, + {57, 20242}, + {58, 20468}, + {59, 20694}, + {60, 20920}, + {61, 21146}, + {62, 21372}, + {63, 21598}, + {64, 21824}, + {65, 22050}, + {66, 22276}, + {67, 22502}, + {68, 22728}, + {69, 22954}, + {70, 23180}, + {71, 23406}, + {72, 23632}, + {73, 23858}, + {74, 24084}, + {115, 26750}, + {116, 26827}, + {117, 26904}, + {118, 26981}, + {119, 27058}, + {120, 27135}, + {121, 27212}, + {122, 27289}, + {123, 27366}, + {124, 27443}, + {125, 27520}, + {126, 27597}, + {127, 27674}, + {128, 27751}, + {129, 27828}, + {130, 27905}, + {131, 27982}, + {132, 28059}, + {133, 28136}, + {134, 28213}, + {135, 28290}, + {136, 28367}, + {137, 28444}, + {138, 28521}, + {139, 28598}, + {140, 28675}, + {141, 28752}, + {142, 28829}, + {143, 28906}, + {144, 28983}, + {145, 29060}, + {146, 29137}, + {147, 29214}, + {148, 29291}, + {149, 29368}, + {150, 29445}, + {151, 29522}, + {152, 29599}, + {153, 29676}, + {154, 29753}, + {155, 29830}, + {156, 30200}, + {157, 30570}, + {158, 30940}, + {159, 31310}, + {160, 31680}, + {161, 32050}, + {162, 32420}, + {163, 32790}, + {164, 33160}, + {165, 33530}, + {166, 33900}, + {167, 34270}, + {168, 34640}, + {169, 35010}, + {170, 35380}, + {171, 35750}, + {172, 36211}, + {173, 36672}, + {174, 37133}, + {175, 37594}, + {176, 38055}, + {177, 38516}, + {178, 38977}, + {179, 39438}, + {180, 39899}, + {181, 40360}, + {182, 40821}, + {183, 41282}, + {184, 41743}, + {185, 42204}, + {186, 42665}, + {188, 43249}, + {199, 43729}, + {200, 43818}, + {201, 43907}, + {202, 43996}, + {203, 44085}, + {204, 44174}, + {205, 44263}, + {206, 44352}, + {207, 44441}, + {208, 44530}, + {209, 44619}, + {210, 44708}, + {211, 44797}, + {212, 44886}, + {213, 44975}, + {214, 45064}, + {252, 50144}, + {261, 50747}, + {262, 50811}, + {263, 50875}, + {264, 50939}, + {265, 51003}, + {266, 51067}, + {267, 51131}, + {268, 51195}, + {269, 51259}, + {270, 51323}, + {271, 51387}, + {272, 51451}, + {273, 51515}, + {274, 51579}, + {275, 51643}, + {276, 51707}, + {297, 52743}, + {298, 52978}, + {299, 53213}, + {300, 53448}, + {301, 53683}, + {302, 53918}, + {303, 54153}, + {304, 54388}, + {305, 54623}, + {306, 54858}, + {307, 55093}, + {308, 55328}, + {309, 55563}, + {310, 55798}, + {311, 56033}, + {312, 56268}, + {313, 56503}, + {314, 56738}, + {315, 56973}, + {316, 57208}, + {317, 57443}, + {318, 57678}, + {319, 57913}, + {320, 58148}, + {334, 59893}, }; GpaPaddedCounterDesc kDx12PaddedCounterByGroupGfx10[] = { @@ -1268,7 +1268,6 @@ namespace counter_dx12_gfx10 const std::set kHwDx12TimestampBlockIdsGfx10 = {334}; ///< Timestamp block id's for DX12 for gfx10 family const std::set kHwDx12TimeCounterIndicesGfx10 = {59893, 59894, 59895, 59896, 59897, 59898}; ///< Timestamp counter indices for DX12 for gfx10 family const unsigned int kHwDx12GroupCountGfx10 = static_cast(kHwDx12GroupsGfx10.size()); - const unsigned int kHwDx12ExposedCountersGroupCountGfx10 = 206; const unsigned int kDx12PaddedCounterGroupCountGfx10 = 0; const unsigned int kHwDx12SqGroupCountGfx10 = sizeof(kHwDx12SqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx12SqIsolatedGroupCountGfx10 = sizeof(kHwDx12SqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.h index bdd1684b..ca81798e 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx10.h @@ -42,7 +42,6 @@ namespace counter_dx12_gfx10 extern const std::set kHwDx12TimestampBlockIdsGfx10; ///< Timestamp block id's for Dx12 for Gfx10 family extern const std::set kHwDx12TimeCounterIndicesGfx10; ///< Timestamp counter indices for Dx12 for Gfx10 family extern const unsigned int kHwDx12GroupCountGfx10; ///< Hardware Group Count for Dx12 for Gfx10 family - extern const unsigned int kHwDx12ExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Dx12 for Gfx10 family extern const unsigned int kDx12PaddedCounterGroupCountGfx10; ///< reserved counter group count for Dx12 for Gfx10 family extern const unsigned int kHwDx12SqGroupCountGfx10; ///< Hardware SQ Group Count for Dx12 for Gfx10 family extern const unsigned int kHwDx12SqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Dx12 for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.cc index b5bc4a4c..f4ce6a6b 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.cc @@ -969,414 +969,414 @@ namespace counter_dx12_gfx103 }; GpaCounterGroupExposedCounterDesc kHwDx12ExposedCountersByGroupGfx103[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 316, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 592, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 868, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1144, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1722, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2300, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2878, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3456, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 4034, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4612, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 5190, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5768, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 6346, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 6924, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {16, 7502, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {17, 8080, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {18, 8658, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {19, 9236, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {20, 9814, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {21, 10392, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {22, 10724, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {23, 11056, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {24, 11388, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {25, 11720, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 12232, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12744, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 13256, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13768, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 14280, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14792, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {32, 15304, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {33, 15816, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {34, 16328, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {35, 16840, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {36, 17352, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {37, 17864, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {38, 18376, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {39, 18888, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {40, 19400, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {41, 19912, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {42, 20424, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {43, 20936, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {44, 21448, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {45, 21960, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {46, 22472, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {47, 22984, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {48, 23496, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {49, 24008, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {50, 24520, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {51, 25032, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {52, 25544, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {53, 26056, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {54, 26568, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {55, 27080, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {56, 27592, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {57, 28104, {12, 14, 17, 19, 22, 24, 27, 29}}, - {58, 28329, {12, 14, 17, 19, 22, 24, 27, 29}}, - {59, 28554, {12, 14, 17, 19, 22, 24, 27, 29}}, - {60, 28779, {12, 14, 17, 19, 22, 24, 27, 29}}, - {61, 29004, {12, 14, 17, 19, 22, 24, 27, 29}}, - {62, 29229, {12, 14, 17, 19, 22, 24, 27, 29}}, - {63, 29454, {12, 14, 17, 19, 22, 24, 27, 29}}, - {64, 29679, {12, 14, 17, 19, 22, 24, 27, 29}}, - {65, 29904, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {66, 30140, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {67, 30376, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {68, 30612, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {69, 30848, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {70, 31084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {71, 31320, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {72, 31556, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {73, 31792, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {74, 32028, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {75, 32264, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {76, 32500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {77, 32736, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {78, 32972, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {79, 33208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 33444, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 33680, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 33916, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 34152, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 34388, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 34624, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 34860, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 35096, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 35332, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 35568, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 35804, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 36040, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 36276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 36512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 36748, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 36984, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 37220, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 37456, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 37692, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 37928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 38164, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 38400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 38636, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 38872, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 39108, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 39344, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 39580, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 39816, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 40052, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 40288, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 40524, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 40760, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 40996, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 41232, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 41468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 41704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 41940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 42176, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 42412, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 42648, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 42884, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 43120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 43356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 43592, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 43828, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 44064, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 44300, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 44536, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 44772, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 45008, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 45244, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 45480, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 45716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 45952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 46188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 46424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 46660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 46896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 47132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 47368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 47604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 47840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 48076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 48312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 48548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 48784, {82, 116, 117, 118}}, - {146, 48976, {82, 116, 117, 118}}, - {147, 49168, {82, 116, 117, 118}}, - {148, 49360, {82, 116, 117, 118}}, - {149, 49552, {82, 116, 117, 118}}, - {150, 49744, {82, 116, 117, 118}}, - {151, 49936, {82, 116, 117, 118}}, - {152, 50128, {82, 116, 117, 118}}, - {153, 50320, {82, 116, 117, 118}}, - {154, 50512, {82, 116, 117, 118}}, - {155, 50704, {82, 116, 117, 118}}, - {156, 50896, {82, 116, 117, 118}}, - {157, 51088, {82, 116, 117, 118}}, - {158, 51280, {82, 116, 117, 118}}, - {159, 51472, {82, 116, 117, 118}}, - {160, 51664, {82, 116, 117, 118}}, - {161, 51856, {82, 116, 117, 118}}, - {162, 52048, {82, 116, 117, 118}}, - {163, 52240, {82, 116, 117, 118}}, - {164, 52432, {82, 116, 117, 118}}, - {165, 52624, {82, 116, 117, 118}}, - {166, 52816, {82, 116, 117, 118}}, - {167, 53008, {82, 116, 117, 118}}, - {168, 53200, {82, 116, 117, 118}}, - {169, 53392, {82, 116, 117, 118}}, - {170, 53584, {82, 116, 117, 118}}, - {171, 53776, {82, 116, 117, 118}}, - {172, 53968, {82, 116, 117, 118}}, - {173, 54160, {82, 116, 117, 118}}, - {174, 54352, {82, 116, 117, 118}}, - {175, 54544, {82, 116, 117, 118}}, - {176, 54736, {82, 116, 117, 118}}, - {177, 54928, {82, 116, 117, 118}}, - {178, 55120, {82, 116, 117, 118}}, - {179, 55312, {82, 116, 117, 118}}, - {180, 55504, {82, 116, 117, 118}}, - {181, 55696, {82, 116, 117, 118}}, - {182, 55888, {82, 116, 117, 118}}, - {183, 56080, {82, 116, 117, 118}}, - {184, 56272, {82, 116, 117, 118}}, - {185, 56464, {82, 116, 117, 118}}, - {186, 56656, {82, 116, 117, 118}}, - {187, 56848, {82, 116, 117, 118}}, - {188, 57040, {82, 116, 117, 118}}, - {189, 57232, {82, 116, 117, 118}}, - {190, 57424, {82, 116, 117, 118}}, - {191, 57616, {82, 116, 117, 118}}, - {192, 57808, {82, 116, 117, 118}}, - {193, 58000, {82, 116, 117, 118}}, - {194, 58192, {82, 116, 117, 118}}, - {195, 58384, {82, 116, 117, 118}}, - {196, 58576, {82, 116, 117, 118}}, - {197, 58768, {82, 116, 117, 118}}, - {198, 58960, {82, 116, 117, 118}}, - {199, 59152, {82, 116, 117, 118}}, - {200, 59344, {82, 116, 117, 118}}, - {201, 59536, {82, 116, 117, 118}}, - {202, 59728, {82, 116, 117, 118}}, - {203, 59920, {82, 116, 117, 118}}, - {204, 60112, {82, 116, 117, 118}}, - {205, 60304, {82, 116, 117, 118}}, - {206, 60496, {82, 116, 117, 118}}, - {207, 60688, {82, 116, 117, 118}}, - {208, 60880, {82, 116, 117, 118}}, - {209, 61072, {82, 116, 117, 118}}, - {210, 61264, {82, 116, 117, 118}}, - {211, 61456, {82, 116, 117, 118}}, - {212, 61648, {82, 116, 117, 118}}, - {213, 61840, {82, 116, 117, 118}}, - {214, 62032, {82, 116, 117, 118}}, - {215, 62224, {82, 116, 117, 118}}, - {216, 62416, {82, 116, 117, 118}}, - {217, 62608, {82, 116, 117, 118}}, - {218, 62800, {82, 116, 117, 118}}, - {219, 62992, {82, 116, 117, 118}}, - {220, 63184, {82, 116, 117, 118}}, - {221, 63376, {82, 116, 117, 118}}, - {222, 63568, {82, 116, 117, 118}}, - {223, 63760, {82, 116, 117, 118}}, - {224, 63952, {82, 116, 117, 118}}, - {225, 64144, {9, 18, 36, 43, 44, 45}}, - {226, 64205, {9, 18, 36, 43, 44, 45}}, - {227, 64266, {9, 18, 36, 43, 44, 45}}, - {228, 64327, {9, 18, 36, 43, 44, 45}}, - {229, 64388, {9, 18, 36, 43, 44, 45}}, - {230, 64449, {9, 18, 36, 43, 44, 45}}, - {231, 64510, {9, 18, 36, 43, 44, 45}}, - {232, 64571, {9, 18, 36, 43, 44, 45}}, - {233, 64632, {9, 18, 36, 43, 44, 45}}, - {234, 64693, {9, 18, 36, 43, 44, 45}}, - {235, 64754, {9, 18, 36, 43, 44, 45}}, - {236, 64815, {9, 18, 36, 43, 44, 45}}, - {237, 64876, {9, 18, 36, 43, 44, 45}}, - {238, 64937, {9, 18, 36, 43, 44, 45}}, - {239, 64998, {9, 18, 36, 43, 44, 45}}, - {240, 65059, {9, 18, 36, 43, 44, 45}}, - {241, 65120, {9, 18, 36, 43, 44, 45}}, - {242, 65181, {9, 18, 36, 43, 44, 45}}, - {243, 65242, {9, 18, 36, 43, 44, 45}}, - {244, 65303, {9, 18, 36, 43, 44, 45}}, - {245, 65364, {9, 18, 36, 43, 44, 45}}, - {246, 65425, {9, 18, 36, 43, 44, 45}}, - {247, 65486, {9, 18, 36, 43, 44, 45}}, - {248, 65547, {9, 18, 36, 43, 44, 45}}, - {249, 65608, {9, 18, 36, 43, 44, 45}}, - {250, 65669, {9, 18, 36, 43, 44, 45}}, - {251, 65730, {9, 18, 36, 43, 44, 45}}, - {252, 65791, {9, 18, 36, 43, 44, 45}}, - {253, 65852, {9, 18, 36, 43, 44, 45}}, - {254, 65913, {9, 18, 36, 43, 44, 45}}, - {255, 65974, {9, 18, 36, 43, 44, 45}}, - {256, 66035, {9, 18, 36, 43, 44, 45}}, - {257, 66096, {9, 18, 36, 43, 44, 45}}, - {258, 66157, {9, 18, 36, 43, 44, 45}}, - {259, 66218, {9, 18, 36, 43, 44, 45}}, - {260, 66279, {9, 18, 36, 43, 44, 45}}, - {261, 66340, {9, 18, 36, 43, 44, 45}}, - {262, 66401, {9, 18, 36, 43, 44, 45}}, - {263, 66462, {9, 18, 36, 43, 44, 45}}, - {264, 66523, {9, 18, 36, 43, 44, 45}}, - {265, 66584, {9, 18, 36, 43, 44, 45}}, - {266, 66645, {9, 18, 36, 43, 44, 45}}, - {267, 66706, {9, 18, 36, 43, 44, 45}}, - {268, 66767, {9, 18, 36, 43, 44, 45}}, - {269, 66828, {9, 18, 36, 43, 44, 45}}, - {270, 66889, {9, 18, 36, 43, 44, 45}}, - {271, 66950, {9, 18, 36, 43, 44, 45}}, - {272, 67011, {9, 18, 36, 43, 44, 45}}, - {273, 67072, {9, 18, 36, 43, 44, 45}}, - {274, 67133, {9, 18, 36, 43, 44, 45}}, - {275, 67194, {9, 18, 36, 43, 44, 45}}, - {276, 67255, {9, 18, 36, 43, 44, 45}}, - {277, 67316, {9, 18, 36, 43, 44, 45}}, - {278, 67377, {9, 18, 36, 43, 44, 45}}, - {279, 67438, {9, 18, 36, 43, 44, 45}}, - {280, 67499, {9, 18, 36, 43, 44, 45}}, - {281, 67560, {9, 18, 36, 43, 44, 45}}, - {282, 67621, {9, 18, 36, 43, 44, 45}}, - {283, 67682, {9, 18, 36, 43, 44, 45}}, - {284, 67743, {9, 18, 36, 43, 44, 45}}, - {285, 67804, {9, 18, 36, 43, 44, 45}}, - {286, 67865, {9, 18, 36, 43, 44, 45}}, - {287, 67926, {9, 18, 36, 43, 44, 45}}, - {288, 67987, {9, 18, 36, 43, 44, 45}}, - {289, 68048, {9, 18, 36, 43, 44, 45}}, - {290, 68109, {9, 18, 36, 43, 44, 45}}, - {291, 68170, {9, 18, 36, 43, 44, 45}}, - {292, 68231, {9, 18, 36, 43, 44, 45}}, - {293, 68292, {9, 18, 36, 43, 44, 45}}, - {294, 68353, {9, 18, 36, 43, 44, 45}}, - {295, 68414, {9, 18, 36, 43, 44, 45}}, - {296, 68475, {9, 18, 36, 43, 44, 45}}, - {297, 68536, {9, 18, 36, 43, 44, 45}}, - {298, 68597, {9, 18, 36, 43, 44, 45}}, - {299, 68658, {9, 18, 36, 43, 44, 45}}, - {300, 68719, {9, 18, 36, 43, 44, 45}}, - {301, 68780, {9, 18, 36, 43, 44, 45}}, - {302, 68841, {9, 18, 36, 43, 44, 45}}, - {303, 68902, {9, 18, 36, 43, 44, 45}}, - {304, 68963, {9, 18, 36, 43, 44, 45}}, - {305, 69024, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {306, 69415, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {307, 69806, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {308, 70197, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {309, 70588, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {310, 70979, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {311, 71370, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {312, 71761, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {313, 72152, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {314, 72543, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {315, 72934, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {316, 73325, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {317, 73716, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {318, 74107, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {319, 74498, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {320, 74889, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {321, 75280, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {322, 75733, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {323, 76186, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {324, 76639, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {325, 77092, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {326, 77545, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {327, 77998, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {328, 78451, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {329, 78904, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {330, 79357, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {331, 79810, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {332, 80263, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {333, 80716, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {334, 81169, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {335, 81622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {336, 82075, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {338, 82649, {0, 2}}, - {351, 83291, {55, 57}}, - {352, 83381, {55, 57}}, - {353, 83471, {55, 57}}, - {354, 83561, {55, 57}}, - {355, 83651, {55, 57}}, - {356, 83741, {55, 57}}, - {357, 83831, {55, 57}}, - {358, 83921, {55, 57}}, - {359, 84011, {55, 57}}, - {360, 84101, {55, 57}}, - {361, 84191, {55, 57}}, - {362, 84281, {55, 57}}, - {363, 84371, {55, 57}}, - {364, 84461, {55, 57}}, - {365, 84551, {55, 57}}, - {366, 84641, {55, 57}}, - {429, 94083, {14, 18}}, - {430, 94166, {14, 18}}, - {431, 94249, {14, 18}}, - {432, 94332, {14, 18}}, - {433, 94415, {14, 18}}, - {434, 94498, {14, 18}}, - {435, 94581, {14, 18}}, - {436, 94664, {14, 18}}, - {437, 94747, {14, 18}}, - {438, 94830, {14, 18}}, - {439, 94913, {14, 18}}, - {440, 94996, {14, 18}}, - {441, 95079, {14, 18}}, - {442, 95162, {14, 18}}, - {443, 95245, {14, 18}}, - {444, 95328, {14, 18}}, - {445, 95411, {14, 18}}, - {446, 95494, {14, 18}}, - {447, 95577, {14, 18}}, - {448, 95660, {14, 18}}, - {449, 95743, {14, 18}}, - {450, 95826, {14, 18}}, - {451, 95909, {14, 18}}, - {452, 95992, {14, 18}}, - {453, 96075, {14, 18}}, - {454, 96158, {14, 18}}, - {455, 96241, {14, 18}}, - {456, 96324, {14, 18}}, - {457, 96407, {14, 18}}, - {458, 96490, {14, 18}}, - {459, 96573, {14, 18}}, - {460, 96656, {14, 18}}, - {497, 98319, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {498, 98573, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {499, 98827, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {500, 99081, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {501, 99335, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {502, 99589, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {503, 99843, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {504, 100097, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {505, 100351, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {506, 100605, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {507, 100859, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {508, 101113, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {509, 101367, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {510, 101621, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {511, 101875, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {512, 102129, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {530, 104101, {42}}, - {531, 104164, {4, 73, 80, 86, 111}}, - {532, 104303, {4, 73, 80, 86, 111}}, - {533, 104442, {4, 73, 80, 86, 111}}, - {534, 104581, {4, 73, 80, 86, 111}}, - {535, 104720, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 316}, + {3, 592}, + {4, 868}, + {5, 1144}, + {6, 1722}, + {7, 2300}, + {8, 2878}, + {9, 3456}, + {10, 4034}, + {11, 4612}, + {12, 5190}, + {13, 5768}, + {14, 6346}, + {15, 6924}, + {16, 7502}, + {17, 8080}, + {18, 8658}, + {19, 9236}, + {20, 9814}, + {21, 10392}, + {22, 10724}, + {23, 11056}, + {24, 11388}, + {25, 11720}, + {26, 12232}, + {27, 12744}, + {28, 13256}, + {29, 13768}, + {30, 14280}, + {31, 14792}, + {32, 15304}, + {33, 15816}, + {34, 16328}, + {35, 16840}, + {36, 17352}, + {37, 17864}, + {38, 18376}, + {39, 18888}, + {40, 19400}, + {41, 19912}, + {42, 20424}, + {43, 20936}, + {44, 21448}, + {45, 21960}, + {46, 22472}, + {47, 22984}, + {48, 23496}, + {49, 24008}, + {50, 24520}, + {51, 25032}, + {52, 25544}, + {53, 26056}, + {54, 26568}, + {55, 27080}, + {56, 27592}, + {57, 28104}, + {58, 28329}, + {59, 28554}, + {60, 28779}, + {61, 29004}, + {62, 29229}, + {63, 29454}, + {64, 29679}, + {65, 29904}, + {66, 30140}, + {67, 30376}, + {68, 30612}, + {69, 30848}, + {70, 31084}, + {71, 31320}, + {72, 31556}, + {73, 31792}, + {74, 32028}, + {75, 32264}, + {76, 32500}, + {77, 32736}, + {78, 32972}, + {79, 33208}, + {80, 33444}, + {81, 33680}, + {82, 33916}, + {83, 34152}, + {84, 34388}, + {85, 34624}, + {86, 34860}, + {87, 35096}, + {88, 35332}, + {89, 35568}, + {90, 35804}, + {91, 36040}, + {92, 36276}, + {93, 36512}, + {94, 36748}, + {95, 36984}, + {96, 37220}, + {97, 37456}, + {98, 37692}, + {99, 37928}, + {100, 38164}, + {101, 38400}, + {102, 38636}, + {103, 38872}, + {104, 39108}, + {105, 39344}, + {106, 39580}, + {107, 39816}, + {108, 40052}, + {109, 40288}, + {110, 40524}, + {111, 40760}, + {112, 40996}, + {113, 41232}, + {114, 41468}, + {115, 41704}, + {116, 41940}, + {117, 42176}, + {118, 42412}, + {119, 42648}, + {120, 42884}, + {121, 43120}, + {122, 43356}, + {123, 43592}, + {124, 43828}, + {125, 44064}, + {126, 44300}, + {127, 44536}, + {128, 44772}, + {129, 45008}, + {130, 45244}, + {131, 45480}, + {132, 45716}, + {133, 45952}, + {134, 46188}, + {135, 46424}, + {136, 46660}, + {137, 46896}, + {138, 47132}, + {139, 47368}, + {140, 47604}, + {141, 47840}, + {142, 48076}, + {143, 48312}, + {144, 48548}, + {145, 48784}, + {146, 48976}, + {147, 49168}, + {148, 49360}, + {149, 49552}, + {150, 49744}, + {151, 49936}, + {152, 50128}, + {153, 50320}, + {154, 50512}, + {155, 50704}, + {156, 50896}, + {157, 51088}, + {158, 51280}, + {159, 51472}, + {160, 51664}, + {161, 51856}, + {162, 52048}, + {163, 52240}, + {164, 52432}, + {165, 52624}, + {166, 52816}, + {167, 53008}, + {168, 53200}, + {169, 53392}, + {170, 53584}, + {171, 53776}, + {172, 53968}, + {173, 54160}, + {174, 54352}, + {175, 54544}, + {176, 54736}, + {177, 54928}, + {178, 55120}, + {179, 55312}, + {180, 55504}, + {181, 55696}, + {182, 55888}, + {183, 56080}, + {184, 56272}, + {185, 56464}, + {186, 56656}, + {187, 56848}, + {188, 57040}, + {189, 57232}, + {190, 57424}, + {191, 57616}, + {192, 57808}, + {193, 58000}, + {194, 58192}, + {195, 58384}, + {196, 58576}, + {197, 58768}, + {198, 58960}, + {199, 59152}, + {200, 59344}, + {201, 59536}, + {202, 59728}, + {203, 59920}, + {204, 60112}, + {205, 60304}, + {206, 60496}, + {207, 60688}, + {208, 60880}, + {209, 61072}, + {210, 61264}, + {211, 61456}, + {212, 61648}, + {213, 61840}, + {214, 62032}, + {215, 62224}, + {216, 62416}, + {217, 62608}, + {218, 62800}, + {219, 62992}, + {220, 63184}, + {221, 63376}, + {222, 63568}, + {223, 63760}, + {224, 63952}, + {225, 64144}, + {226, 64205}, + {227, 64266}, + {228, 64327}, + {229, 64388}, + {230, 64449}, + {231, 64510}, + {232, 64571}, + {233, 64632}, + {234, 64693}, + {235, 64754}, + {236, 64815}, + {237, 64876}, + {238, 64937}, + {239, 64998}, + {240, 65059}, + {241, 65120}, + {242, 65181}, + {243, 65242}, + {244, 65303}, + {245, 65364}, + {246, 65425}, + {247, 65486}, + {248, 65547}, + {249, 65608}, + {250, 65669}, + {251, 65730}, + {252, 65791}, + {253, 65852}, + {254, 65913}, + {255, 65974}, + {256, 66035}, + {257, 66096}, + {258, 66157}, + {259, 66218}, + {260, 66279}, + {261, 66340}, + {262, 66401}, + {263, 66462}, + {264, 66523}, + {265, 66584}, + {266, 66645}, + {267, 66706}, + {268, 66767}, + {269, 66828}, + {270, 66889}, + {271, 66950}, + {272, 67011}, + {273, 67072}, + {274, 67133}, + {275, 67194}, + {276, 67255}, + {277, 67316}, + {278, 67377}, + {279, 67438}, + {280, 67499}, + {281, 67560}, + {282, 67621}, + {283, 67682}, + {284, 67743}, + {285, 67804}, + {286, 67865}, + {287, 67926}, + {288, 67987}, + {289, 68048}, + {290, 68109}, + {291, 68170}, + {292, 68231}, + {293, 68292}, + {294, 68353}, + {295, 68414}, + {296, 68475}, + {297, 68536}, + {298, 68597}, + {299, 68658}, + {300, 68719}, + {301, 68780}, + {302, 68841}, + {303, 68902}, + {304, 68963}, + {305, 69024}, + {306, 69415}, + {307, 69806}, + {308, 70197}, + {309, 70588}, + {310, 70979}, + {311, 71370}, + {312, 71761}, + {313, 72152}, + {314, 72543}, + {315, 72934}, + {316, 73325}, + {317, 73716}, + {318, 74107}, + {319, 74498}, + {320, 74889}, + {321, 75280}, + {322, 75733}, + {323, 76186}, + {324, 76639}, + {325, 77092}, + {326, 77545}, + {327, 77998}, + {328, 78451}, + {329, 78904}, + {330, 79357}, + {331, 79810}, + {332, 80263}, + {333, 80716}, + {334, 81169}, + {335, 81622}, + {336, 82075}, + {338, 82649}, + {351, 83291}, + {352, 83381}, + {353, 83471}, + {354, 83561}, + {355, 83651}, + {356, 83741}, + {357, 83831}, + {358, 83921}, + {359, 84011}, + {360, 84101}, + {361, 84191}, + {362, 84281}, + {363, 84371}, + {364, 84461}, + {365, 84551}, + {366, 84641}, + {429, 94083}, + {430, 94166}, + {431, 94249}, + {432, 94332}, + {433, 94415}, + {434, 94498}, + {435, 94581}, + {436, 94664}, + {437, 94747}, + {438, 94830}, + {439, 94913}, + {440, 94996}, + {441, 95079}, + {442, 95162}, + {443, 95245}, + {444, 95328}, + {445, 95411}, + {446, 95494}, + {447, 95577}, + {448, 95660}, + {449, 95743}, + {450, 95826}, + {451, 95909}, + {452, 95992}, + {453, 96075}, + {454, 96158}, + {455, 96241}, + {456, 96324}, + {457, 96407}, + {458, 96490}, + {459, 96573}, + {460, 96656}, + {497, 98319}, + {498, 98573}, + {499, 98827}, + {500, 99081}, + {501, 99335}, + {502, 99589}, + {503, 99843}, + {504, 100097}, + {505, 100351}, + {506, 100605}, + {507, 100859}, + {508, 101113}, + {509, 101367}, + {510, 101621}, + {511, 101875}, + {512, 102129}, + {530, 104101}, + {531, 104164}, + {532, 104303}, + {533, 104442}, + {534, 104581}, + {535, 104720}, }; GpaPaddedCounterDesc kDx12PaddedCounterByGroupGfx103[] = { @@ -2210,7 +2210,6 @@ namespace counter_dx12_gfx103 const std::set kHwDx12TimestampBlockIdsGfx103 = {535}; ///< Timestamp block id's for DX12 for gfx103 family const std::set kHwDx12TimeCounterIndicesGfx103 = {104720, 104721, 104722, 104723, 104724, 104725}; ///< Timestamp counter indices for DX12 for gfx103 family const unsigned int kHwDx12GroupCountGfx103 = static_cast(kHwDx12GroupsGfx103.size()); - const unsigned int kHwDx12ExposedCountersGroupCountGfx103 = 408; const unsigned int kDx12PaddedCounterGroupCountGfx103 = 0; const unsigned int kHwDx12SqGroupCountGfx103 = sizeof(kHwDx12SqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx12SqIsolatedGroupCountGfx103 = sizeof(kHwDx12SqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.h index 1d3afac8..e81f988c 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx103.h @@ -42,7 +42,6 @@ namespace counter_dx12_gfx103 extern const std::set kHwDx12TimestampBlockIdsGfx103; ///< Timestamp block id's for Dx12 for Gfx103 family extern const std::set kHwDx12TimeCounterIndicesGfx103; ///< Timestamp counter indices for Dx12 for Gfx103 family extern const unsigned int kHwDx12GroupCountGfx103; ///< Hardware Group Count for Dx12 for Gfx103 family - extern const unsigned int kHwDx12ExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Dx12 for Gfx103 family extern const unsigned int kDx12PaddedCounterGroupCountGfx103; ///< reserved counter group count for Dx12 for Gfx103 family extern const unsigned int kHwDx12SqGroupCountGfx103; ///< Hardware SQ Group Count for Dx12 for Gfx103 family extern const unsigned int kHwDx12SqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Dx12 for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.cc index 04af1b13..a183ceeb 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.cc @@ -1673,766 +1673,766 @@ namespace counter_dx12_gfx11 }; GpaCounterGroupExposedCounterDesc kHwDx12ExposedCountersByGroupGfx11[] = { - {0, 0, {0, 24}}, - {1, 44, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 355, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 666, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 977, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1288, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {6, 1599, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {7, 1910, {159, 235, 259}}, - {8, 2577, {159, 235, 259}}, - {9, 3244, {159, 235, 259}}, - {10, 3911, {159, 235, 259}}, - {11, 4578, {159, 235, 259}}, - {12, 5245, {159, 235, 259}}, - {13, 5912, {159, 235, 259}}, - {14, 6579, {159, 235, 259}}, - {15, 7246, {159, 235, 259}}, - {16, 7913, {159, 235, 259}}, - {17, 8580, {159, 235, 259}}, - {18, 9247, {159, 235, 259}}, - {19, 9914, {159, 235, 259}}, - {20, 10581, {159, 235, 259}}, - {21, 11248, {159, 235, 259}}, - {22, 11915, {159, 235, 259}}, - {23, 12582, {159, 235, 259}}, - {24, 13249, {159, 235, 259}}, - {25, 13916, {159, 235, 259}}, - {26, 14583, {159, 235, 259}}, - {27, 15250, {159, 235, 259}}, - {28, 15917, {159, 235, 259}}, - {29, 16584, {159, 235, 259}}, - {30, 17251, {159, 235, 259}}, - {31, 17918, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {32, 18202, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {33, 18486, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {34, 18770, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {35, 19054, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {36, 19338, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {37, 19622, {20, 21, 24}}, - {38, 19659, {20, 21, 24}}, - {39, 19696, {20, 21, 24}}, - {40, 19733, {20, 21, 24}}, - {41, 19770, {20, 21, 24}}, - {42, 19807, {20, 21, 24}}, - {43, 19844, {20, 21, 24}}, - {44, 19881, {20, 21, 24}}, - {45, 19918, {20, 21, 24}}, - {46, 19955, {20, 21, 24}}, - {47, 19992, {20, 21, 24}}, - {48, 20029, {20, 21, 24}}, - {49, 20066, {20, 21, 24}}, - {50, 20103, {20, 21, 24}}, - {51, 20140, {20, 21, 24}}, - {52, 20177, {20, 21, 24}}, - {53, 20214, {20, 21, 24}}, - {54, 20251, {20, 21, 24}}, - {55, 20288, {20, 21, 24}}, - {56, 20325, {20, 21, 24}}, - {57, 20362, {20, 21, 24}}, - {58, 20399, {20, 21, 24}}, - {59, 20436, {20, 21, 24}}, - {60, 20473, {20, 21, 24}}, - {61, 20510, {20, 21, 24}}, - {62, 20547, {20, 21, 24}}, - {63, 20584, {20, 21, 24}}, - {64, 20621, {20, 21, 24}}, - {65, 20658, {20, 21, 24}}, - {66, 20695, {20, 21, 24}}, - {67, 20732, {12, 14, 17, 19, 22, 24, 27, 29}}, - {68, 20814, {12, 14, 17, 19, 22, 24, 27, 29}}, - {69, 20896, {12, 14, 17, 19, 22, 24, 27, 29}}, - {70, 20978, {12, 14, 17, 19, 22, 24, 27, 29}}, - {71, 21060, {12, 14, 17, 19, 22, 24, 27, 29}}, - {72, 21142, {12, 14, 17, 19, 22, 24, 27, 29}}, - {73, 21224, {12, 14, 17, 19, 22, 24, 27, 29}}, - {74, 21306, {12, 14, 17, 19, 22, 24, 27, 29}}, - {75, 21388, {12, 14, 17, 19, 22, 24, 27, 29}}, - {76, 21470, {12, 14, 17, 19, 22, 24, 27, 29}}, - {77, 21552, {12, 14, 17, 19, 22, 24, 27, 29}}, - {78, 21634, {12, 14, 17, 19, 22, 24, 27, 29}}, - {79, 21716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 21952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 22188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 22424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 22660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 22896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 23132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 23368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 23604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 23840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 24076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 24312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 24548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 25020, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 25256, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 25492, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 25728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 25964, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 26200, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 26436, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 26672, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 26908, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 27144, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 27380, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 27616, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 27852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 28088, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 28324, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 28560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 28796, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 29032, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 29268, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 29504, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 29740, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 29976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 30212, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 30448, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 30684, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 30920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 31156, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 31392, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 31628, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 31864, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 32100, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 32336, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 32572, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 32808, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 33044, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 33280, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 33516, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 33752, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 33988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 34224, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 34460, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 34696, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 34932, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 35168, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 35404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 35640, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 35876, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 36112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 36348, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 36584, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 36820, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 37056, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 37292, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {146, 37528, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {147, 37764, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {148, 38000, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {149, 38236, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {150, 38472, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {151, 38708, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {152, 38944, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {153, 39180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {154, 39416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {155, 39652, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {156, 39888, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {157, 40124, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {158, 40360, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {159, 40596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {160, 40832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {161, 41068, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {162, 41304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {163, 41540, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {164, 41776, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {165, 42012, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {166, 42248, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {167, 42484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {168, 42720, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {169, 42956, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {170, 43192, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {171, 43428, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {172, 43664, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {173, 43900, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {174, 44136, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {175, 44372, {82, 116, 117, 118}}, - {176, 44569, {82, 116, 117, 118}}, - {177, 44766, {82, 116, 117, 118}}, - {178, 44963, {82, 116, 117, 118}}, - {179, 45160, {82, 116, 117, 118}}, - {180, 45357, {82, 116, 117, 118}}, - {181, 45554, {82, 116, 117, 118}}, - {182, 45751, {82, 116, 117, 118}}, - {183, 45948, {82, 116, 117, 118}}, - {184, 46145, {82, 116, 117, 118}}, - {185, 46342, {82, 116, 117, 118}}, - {186, 46539, {82, 116, 117, 118}}, - {187, 46736, {82, 116, 117, 118}}, - {188, 46933, {82, 116, 117, 118}}, - {189, 47130, {82, 116, 117, 118}}, - {190, 47327, {82, 116, 117, 118}}, - {191, 47524, {82, 116, 117, 118}}, - {192, 47721, {82, 116, 117, 118}}, - {193, 47918, {82, 116, 117, 118}}, - {194, 48115, {82, 116, 117, 118}}, - {195, 48312, {82, 116, 117, 118}}, - {196, 48509, {82, 116, 117, 118}}, - {197, 48706, {82, 116, 117, 118}}, - {198, 48903, {82, 116, 117, 118}}, - {199, 49100, {82, 116, 117, 118}}, - {200, 49297, {82, 116, 117, 118}}, - {201, 49494, {82, 116, 117, 118}}, - {202, 49691, {82, 116, 117, 118}}, - {203, 49888, {82, 116, 117, 118}}, - {204, 50085, {82, 116, 117, 118}}, - {205, 50282, {82, 116, 117, 118}}, - {206, 50479, {82, 116, 117, 118}}, - {207, 50676, {82, 116, 117, 118}}, - {208, 50873, {82, 116, 117, 118}}, - {209, 51070, {82, 116, 117, 118}}, - {210, 51267, {82, 116, 117, 118}}, - {211, 51464, {82, 116, 117, 118}}, - {212, 51661, {82, 116, 117, 118}}, - {213, 51858, {82, 116, 117, 118}}, - {214, 52055, {82, 116, 117, 118}}, - {215, 52252, {82, 116, 117, 118}}, - {216, 52449, {82, 116, 117, 118}}, - {217, 52646, {82, 116, 117, 118}}, - {218, 52843, {82, 116, 117, 118}}, - {219, 53040, {82, 116, 117, 118}}, - {220, 53237, {82, 116, 117, 118}}, - {221, 53434, {82, 116, 117, 118}}, - {222, 53631, {82, 116, 117, 118}}, - {223, 53828, {82, 116, 117, 118}}, - {224, 54025, {82, 116, 117, 118}}, - {225, 54222, {82, 116, 117, 118}}, - {226, 54419, {82, 116, 117, 118}}, - {227, 54616, {82, 116, 117, 118}}, - {228, 54813, {82, 116, 117, 118}}, - {229, 55010, {82, 116, 117, 118}}, - {230, 55207, {82, 116, 117, 118}}, - {231, 55404, {82, 116, 117, 118}}, - {232, 55601, {82, 116, 117, 118}}, - {233, 55798, {82, 116, 117, 118}}, - {234, 55995, {82, 116, 117, 118}}, - {235, 56192, {82, 116, 117, 118}}, - {236, 56389, {82, 116, 117, 118}}, - {237, 56586, {82, 116, 117, 118}}, - {238, 56783, {82, 116, 117, 118}}, - {239, 56980, {82, 116, 117, 118}}, - {240, 57177, {82, 116, 117, 118}}, - {241, 57374, {82, 116, 117, 118}}, - {242, 57571, {82, 116, 117, 118}}, - {243, 57768, {82, 116, 117, 118}}, - {244, 57965, {82, 116, 117, 118}}, - {245, 58162, {82, 116, 117, 118}}, - {246, 58359, {82, 116, 117, 118}}, - {247, 58556, {82, 116, 117, 118}}, - {248, 58753, {82, 116, 117, 118}}, - {249, 58950, {82, 116, 117, 118}}, - {250, 59147, {82, 116, 117, 118}}, - {251, 59344, {82, 116, 117, 118}}, - {252, 59541, {82, 116, 117, 118}}, - {253, 59738, {82, 116, 117, 118}}, - {254, 59935, {82, 116, 117, 118}}, - {255, 60132, {82, 116, 117, 118}}, - {256, 60329, {82, 116, 117, 118}}, - {257, 60526, {82, 116, 117, 118}}, - {258, 60723, {82, 116, 117, 118}}, - {259, 60920, {82, 116, 117, 118}}, - {260, 61117, {82, 116, 117, 118}}, - {261, 61314, {82, 116, 117, 118}}, - {262, 61511, {82, 116, 117, 118}}, - {263, 61708, {82, 116, 117, 118}}, - {264, 61905, {82, 116, 117, 118}}, - {265, 62102, {82, 116, 117, 118}}, - {266, 62299, {82, 116, 117, 118}}, - {267, 62496, {82, 116, 117, 118}}, - {268, 62693, {82, 116, 117, 118}}, - {269, 62890, {82, 116, 117, 118}}, - {270, 63087, {82, 116, 117, 118}}, - {271, 63284, {9, 17, 39, 46, 47, 48}}, - {272, 63362, {9, 17, 39, 46, 47, 48}}, - {273, 63440, {9, 17, 39, 46, 47, 48}}, - {274, 63518, {9, 17, 39, 46, 47, 48}}, - {275, 63596, {9, 17, 39, 46, 47, 48}}, - {276, 63674, {9, 17, 39, 46, 47, 48}}, - {277, 63752, {9, 17, 39, 46, 47, 48}}, - {278, 63830, {9, 17, 39, 46, 47, 48}}, - {279, 63908, {9, 17, 39, 46, 47, 48}}, - {280, 63986, {9, 17, 39, 46, 47, 48}}, - {281, 64064, {9, 17, 39, 46, 47, 48}}, - {282, 64142, {9, 17, 39, 46, 47, 48}}, - {283, 64220, {9, 17, 39, 46, 47, 48}}, - {284, 64298, {9, 17, 39, 46, 47, 48}}, - {285, 64376, {9, 17, 39, 46, 47, 48}}, - {286, 64454, {9, 17, 39, 46, 47, 48}}, - {287, 64532, {9, 17, 39, 46, 47, 48}}, - {288, 64610, {9, 17, 39, 46, 47, 48}}, - {289, 64688, {9, 17, 39, 46, 47, 48}}, - {290, 64766, {9, 17, 39, 46, 47, 48}}, - {291, 64844, {9, 17, 39, 46, 47, 48}}, - {292, 64922, {9, 17, 39, 46, 47, 48}}, - {293, 65000, {9, 17, 39, 46, 47, 48}}, - {294, 65078, {9, 17, 39, 46, 47, 48}}, - {295, 65156, {9, 17, 39, 46, 47, 48}}, - {296, 65234, {9, 17, 39, 46, 47, 48}}, - {297, 65312, {9, 17, 39, 46, 47, 48}}, - {298, 65390, {9, 17, 39, 46, 47, 48}}, - {299, 65468, {9, 17, 39, 46, 47, 48}}, - {300, 65546, {9, 17, 39, 46, 47, 48}}, - {301, 65624, {9, 17, 39, 46, 47, 48}}, - {302, 65702, {9, 17, 39, 46, 47, 48}}, - {303, 65780, {9, 17, 39, 46, 47, 48}}, - {304, 65858, {9, 17, 39, 46, 47, 48}}, - {305, 65936, {9, 17, 39, 46, 47, 48}}, - {306, 66014, {9, 17, 39, 46, 47, 48}}, - {307, 66092, {9, 17, 39, 46, 47, 48}}, - {308, 66170, {9, 17, 39, 46, 47, 48}}, - {309, 66248, {9, 17, 39, 46, 47, 48}}, - {310, 66326, {9, 17, 39, 46, 47, 48}}, - {311, 66404, {9, 17, 39, 46, 47, 48}}, - {312, 66482, {9, 17, 39, 46, 47, 48}}, - {313, 66560, {9, 17, 39, 46, 47, 48}}, - {314, 66638, {9, 17, 39, 46, 47, 48}}, - {315, 66716, {9, 17, 39, 46, 47, 48}}, - {316, 66794, {9, 17, 39, 46, 47, 48}}, - {317, 66872, {9, 17, 39, 46, 47, 48}}, - {318, 66950, {9, 17, 39, 46, 47, 48}}, - {319, 67028, {9, 17, 39, 46, 47, 48}}, - {320, 67106, {9, 17, 39, 46, 47, 48}}, - {321, 67184, {9, 17, 39, 46, 47, 48}}, - {322, 67262, {9, 17, 39, 46, 47, 48}}, - {323, 67340, {9, 17, 39, 46, 47, 48}}, - {324, 67418, {9, 17, 39, 46, 47, 48}}, - {325, 67496, {9, 17, 39, 46, 47, 48}}, - {326, 67574, {9, 17, 39, 46, 47, 48}}, - {327, 67652, {9, 17, 39, 46, 47, 48}}, - {328, 67730, {9, 17, 39, 46, 47, 48}}, - {329, 67808, {9, 17, 39, 46, 47, 48}}, - {330, 67886, {9, 17, 39, 46, 47, 48}}, - {331, 67964, {9, 17, 39, 46, 47, 48}}, - {332, 68042, {9, 17, 39, 46, 47, 48}}, - {333, 68120, {9, 17, 39, 46, 47, 48}}, - {334, 68198, {9, 17, 39, 46, 47, 48}}, - {335, 68276, {9, 17, 39, 46, 47, 48}}, - {336, 68354, {9, 17, 39, 46, 47, 48}}, - {337, 68432, {9, 17, 39, 46, 47, 48}}, - {338, 68510, {9, 17, 39, 46, 47, 48}}, - {339, 68588, {9, 17, 39, 46, 47, 48}}, - {340, 68666, {9, 17, 39, 46, 47, 48}}, - {341, 68744, {9, 17, 39, 46, 47, 48}}, - {342, 68822, {9, 17, 39, 46, 47, 48}}, - {343, 68900, {9, 17, 39, 46, 47, 48}}, - {344, 68978, {9, 17, 39, 46, 47, 48}}, - {345, 69056, {9, 17, 39, 46, 47, 48}}, - {346, 69134, {9, 17, 39, 46, 47, 48}}, - {347, 69212, {9, 17, 39, 46, 47, 48}}, - {348, 69290, {9, 17, 39, 46, 47, 48}}, - {349, 69368, {9, 17, 39, 46, 47, 48}}, - {350, 69446, {9, 17, 39, 46, 47, 48}}, - {351, 69524, {9, 17, 39, 46, 47, 48}}, - {352, 69602, {9, 17, 39, 46, 47, 48}}, - {353, 69680, {9, 17, 39, 46, 47, 48}}, - {354, 69758, {9, 17, 39, 46, 47, 48}}, - {355, 69836, {9, 17, 39, 46, 47, 48}}, - {356, 69914, {9, 17, 39, 46, 47, 48}}, - {357, 69992, {9, 17, 39, 46, 47, 48}}, - {358, 70070, {9, 17, 39, 46, 47, 48}}, - {359, 70148, {9, 17, 39, 46, 47, 48}}, - {360, 70226, {9, 17, 39, 46, 47, 48}}, - {361, 70304, {9, 17, 39, 46, 47, 48}}, - {362, 70382, {9, 17, 39, 46, 47, 48}}, - {363, 70460, {9, 17, 39, 46, 47, 48}}, - {364, 70538, {9, 17, 39, 46, 47, 48}}, - {365, 70616, {9, 17, 39, 46, 47, 48}}, - {366, 70694, {9, 17, 39, 46, 47, 48}}, - {367, 70772, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {368, 71160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {369, 71548, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {370, 71936, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {371, 72324, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {372, 72712, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {373, 73100, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {374, 73488, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {375, 73876, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {376, 74264, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {377, 74652, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {378, 75040, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {379, 75428, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {380, 75816, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {381, 76204, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {382, 76592, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {383, 76980, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {384, 77368, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {385, 77756, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {386, 78144, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {387, 78532, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {388, 78920, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {389, 79308, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {390, 79696, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {391, 80084, {5, 19, 21, 30, 32}}, - {392, 80398, {5, 19, 21, 30, 32}}, - {393, 80712, {5, 19, 21, 30, 32}}, - {394, 81026, {5, 19, 21, 30, 32}}, - {395, 81340, {5, 19, 21, 30, 32}}, - {396, 81654, {5, 19, 21, 30, 32}}, - {397, 81968, {5, 19, 21, 30, 32}}, - {398, 82282, {5, 19, 21, 30, 32}}, - {399, 82596, {5, 19, 21, 30, 32}}, - {400, 82910, {5, 19, 21, 30, 32}}, - {401, 83224, {5, 19, 21, 30, 32}}, - {402, 83538, {5, 19, 21, 30, 32}}, - {403, 83852, {5, 19, 21, 30, 32}}, - {404, 84166, {5, 19, 21, 30, 32}}, - {405, 84480, {5, 19, 21, 30, 32}}, - {406, 84794, {5, 19, 21, 30, 32}}, - {407, 85108, {5, 19, 21, 30, 32}}, - {408, 85422, {5, 19, 21, 30, 32}}, - {409, 85736, {5, 19, 21, 30, 32}}, - {410, 86050, {5, 19, 21, 30, 32}}, - {411, 86364, {5, 19, 21, 30, 32}}, - {412, 86678, {5, 19, 21, 30, 32}}, - {413, 86992, {5, 19, 21, 30, 32}}, - {414, 87306, {5, 19, 21, 30, 32}}, - {416, 87768, {0, 2}}, - {433, 88796, {55, 57}}, - {434, 88894, {55, 57}}, - {435, 88992, {55, 57}}, - {436, 89090, {55, 57}}, - {437, 89188, {55, 57}}, - {438, 89286, {55, 57}}, - {439, 89384, {55, 57}}, - {440, 89482, {55, 57}}, - {441, 89580, {55, 57}}, - {442, 89678, {55, 57}}, - {443, 89776, {55, 57}}, - {444, 89874, {55, 57}}, - {445, 89972, {55, 57}}, - {446, 90070, {55, 57}}, - {447, 90168, {55, 57}}, - {448, 90266, {55, 57}}, - {449, 90364, {55, 57}}, - {450, 90462, {55, 57}}, - {451, 90560, {55, 57}}, - {452, 90658, {55, 57}}, - {453, 90756, {55, 57}}, - {454, 90854, {55, 57}}, - {455, 90952, {55, 57}}, - {456, 91050, {55, 57}}, - {543, 99172, {14, 18}}, - {544, 99256, {14, 18}}, - {545, 99340, {14, 18}}, - {546, 99424, {14, 18}}, - {547, 99508, {14, 18}}, - {548, 99592, {14, 18}}, - {549, 99676, {14, 18}}, - {550, 99760, {14, 18}}, - {551, 99844, {14, 18}}, - {552, 99928, {14, 18}}, - {553, 100012, {14, 18}}, - {554, 100096, {14, 18}}, - {555, 100180, {14, 18}}, - {556, 100264, {14, 18}}, - {557, 100348, {14, 18}}, - {558, 100432, {14, 18}}, - {559, 100516, {14, 18}}, - {560, 100600, {14, 18}}, - {561, 100684, {14, 18}}, - {562, 100768, {14, 18}}, - {563, 100852, {14, 18}}, - {564, 100936, {14, 18}}, - {565, 101020, {14, 18}}, - {566, 101104, {14, 18}}, - {567, 101188, {14, 18}}, - {568, 101272, {14, 18}}, - {569, 101356, {14, 18}}, - {570, 101440, {14, 18}}, - {571, 101524, {14, 18}}, - {572, 101608, {14, 18}}, - {573, 101692, {14, 18}}, - {574, 101776, {14, 18}}, - {575, 101860, {14, 18}}, - {576, 101944, {14, 18}}, - {577, 102028, {14, 18}}, - {578, 102112, {14, 18}}, - {579, 102196, {14, 18}}, - {580, 102280, {14, 18}}, - {581, 102364, {14, 18}}, - {582, 102448, {14, 18}}, - {583, 102532, {14, 18}}, - {584, 102616, {14, 18}}, - {585, 102700, {14, 18}}, - {586, 102784, {14, 18}}, - {587, 102868, {14, 18}}, - {588, 102952, {14, 18}}, - {589, 103036, {14, 18}}, - {590, 103120, {14, 18}}, - {595, 103636, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {596, 103895, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {597, 104154, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {598, 104413, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {599, 104672, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {600, 104931, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {601, 105190, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {602, 105449, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {603, 105708, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {604, 105967, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {605, 106226, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {606, 106485, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {607, 106744, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {608, 107003, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {609, 107262, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {610, 107521, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {611, 107780, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {612, 108039, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {613, 108298, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {614, 108557, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {615, 108816, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {616, 109075, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {617, 109334, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {618, 109593, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {640, 112259, {39}}, - {641, 112360, {0, 12, 17, 23, 79, 80}}, - {642, 112448, {0, 12, 17, 23, 79, 80}}, - {643, 112536, {0, 12, 17, 23, 79, 80}}, - {644, 112624, {0, 12, 17, 23, 79, 80}}, - {645, 112712, {0, 12, 17, 23, 79, 80}}, - {646, 112800, {0, 12, 17, 23, 79, 80}}, - {647, 112888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {648, 113400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {649, 113912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {650, 114424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {651, 114936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {652, 115448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {653, 115960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {654, 116472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {655, 116984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {656, 117496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {657, 118008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {658, 118520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {659, 119032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {660, 119544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {661, 120056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {662, 120568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {663, 121080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {664, 121592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {665, 122104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {666, 122616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {667, 123128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {668, 123640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {669, 124152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {670, 124664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {671, 125176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {672, 125688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {673, 126200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {674, 126712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {675, 127224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {676, 127736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {677, 128248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {678, 128760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {679, 129272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {680, 129784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {681, 130296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {682, 130808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {683, 131320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {684, 131832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {685, 132344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {686, 132856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {687, 133368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {688, 133880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {689, 134392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {690, 134904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {691, 135416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {692, 135928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {693, 136440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {694, 136952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {695, 137464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {696, 137976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {697, 138488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {698, 139000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {699, 139512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {700, 140024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {701, 140536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {702, 141048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {703, 141560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {704, 142072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {705, 142584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {706, 143096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {707, 143608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {708, 144120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {709, 144632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {710, 145144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {711, 145656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {712, 146168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {713, 146680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {714, 147192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {715, 147704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {716, 148216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {717, 148728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {718, 149240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {719, 149752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {720, 150264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {721, 150776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {722, 151288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {723, 151800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {724, 152312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {725, 152824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {726, 153336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {727, 153848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {728, 154360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {729, 154872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {730, 155384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {731, 155896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {732, 156408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {733, 156920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {734, 157432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {735, 157944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {736, 158456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {737, 158968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {738, 159480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {739, 159992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {740, 160504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {741, 161016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {742, 161528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {743, 162040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {744, 162552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {745, 163064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {746, 163576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {747, 164088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {748, 164600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {749, 165112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {750, 165624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {751, 166136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {752, 166648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {753, 167160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {754, 167672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {755, 168184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {756, 168696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {757, 169208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {758, 169720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {759, 170232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {760, 170744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {761, 171256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {762, 171768, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {763, 172280, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {764, 172792, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {765, 173304, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {766, 173816, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {767, 174328, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {768, 174840, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {769, 175352, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {770, 175864, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {771, 176376, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {772, 176888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {773, 177400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {774, 177912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {775, 178424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {776, 178936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {777, 179448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {778, 179960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {779, 180472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {780, 180984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {781, 181496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {782, 182008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {783, 182520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {784, 183032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {785, 183544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {786, 184056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {787, 184568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {788, 185080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {789, 185592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {790, 186104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {791, 186616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {792, 187128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {793, 187640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {794, 188152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {795, 188664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {796, 189176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {797, 189688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {798, 190200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {799, 190712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {800, 191224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {801, 191736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {802, 192248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {803, 192760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {804, 193272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {805, 193784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {806, 194296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {807, 194808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {808, 195320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {809, 195832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {810, 196344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {811, 196856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {812, 197368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {813, 197880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {814, 198392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {815, 198904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {816, 199416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {817, 199928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {818, 200440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {819, 200952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {820, 201464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {821, 201976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {822, 202488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {823, 203000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {824, 203512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {825, 204024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {826, 204536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {827, 205048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {828, 205560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {829, 206072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {830, 206584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {831, 207096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {832, 207608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {833, 208120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {834, 208632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {835, 209144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {836, 209656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {837, 210168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {838, 210680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {839, 211192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {840, 211704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {841, 212216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {842, 212728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {843, 213240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {844, 213752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {845, 214264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {846, 214776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {847, 215288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {848, 215800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {849, 216312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {850, 216824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {851, 217336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {852, 217848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {853, 218360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {854, 218872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {855, 219384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {856, 219896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {857, 220408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {858, 220920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {859, 221432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {860, 221944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {861, 222456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {862, 222968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {863, 223480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {864, 223992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {865, 224504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {866, 225016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {867, 225528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {868, 226040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {869, 226552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {870, 227064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {871, 227576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {872, 228088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {873, 228600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {874, 229112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {875, 229624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {876, 230136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {877, 230648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {878, 231160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {879, 231672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {880, 232184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {881, 232696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {882, 233208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {883, 233720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {884, 234232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {885, 234744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {886, 235256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {887, 235768, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 44}, + {2, 355}, + {3, 666}, + {4, 977}, + {5, 1288}, + {6, 1599}, + {7, 1910}, + {8, 2577}, + {9, 3244}, + {10, 3911}, + {11, 4578}, + {12, 5245}, + {13, 5912}, + {14, 6579}, + {15, 7246}, + {16, 7913}, + {17, 8580}, + {18, 9247}, + {19, 9914}, + {20, 10581}, + {21, 11248}, + {22, 11915}, + {23, 12582}, + {24, 13249}, + {25, 13916}, + {26, 14583}, + {27, 15250}, + {28, 15917}, + {29, 16584}, + {30, 17251}, + {31, 17918}, + {32, 18202}, + {33, 18486}, + {34, 18770}, + {35, 19054}, + {36, 19338}, + {37, 19622}, + {38, 19659}, + {39, 19696}, + {40, 19733}, + {41, 19770}, + {42, 19807}, + {43, 19844}, + {44, 19881}, + {45, 19918}, + {46, 19955}, + {47, 19992}, + {48, 20029}, + {49, 20066}, + {50, 20103}, + {51, 20140}, + {52, 20177}, + {53, 20214}, + {54, 20251}, + {55, 20288}, + {56, 20325}, + {57, 20362}, + {58, 20399}, + {59, 20436}, + {60, 20473}, + {61, 20510}, + {62, 20547}, + {63, 20584}, + {64, 20621}, + {65, 20658}, + {66, 20695}, + {67, 20732}, + {68, 20814}, + {69, 20896}, + {70, 20978}, + {71, 21060}, + {72, 21142}, + {73, 21224}, + {74, 21306}, + {75, 21388}, + {76, 21470}, + {77, 21552}, + {78, 21634}, + {79, 21716}, + {80, 21952}, + {81, 22188}, + {82, 22424}, + {83, 22660}, + {84, 22896}, + {85, 23132}, + {86, 23368}, + {87, 23604}, + {88, 23840}, + {89, 24076}, + {90, 24312}, + {91, 24548}, + {92, 24784}, + {93, 25020}, + {94, 25256}, + {95, 25492}, + {96, 25728}, + {97, 25964}, + {98, 26200}, + {99, 26436}, + {100, 26672}, + {101, 26908}, + {102, 27144}, + {103, 27380}, + {104, 27616}, + {105, 27852}, + {106, 28088}, + {107, 28324}, + {108, 28560}, + {109, 28796}, + {110, 29032}, + {111, 29268}, + {112, 29504}, + {113, 29740}, + {114, 29976}, + {115, 30212}, + {116, 30448}, + {117, 30684}, + {118, 30920}, + {119, 31156}, + {120, 31392}, + {121, 31628}, + {122, 31864}, + {123, 32100}, + {124, 32336}, + {125, 32572}, + {126, 32808}, + {127, 33044}, + {128, 33280}, + {129, 33516}, + {130, 33752}, + {131, 33988}, + {132, 34224}, + {133, 34460}, + {134, 34696}, + {135, 34932}, + {136, 35168}, + {137, 35404}, + {138, 35640}, + {139, 35876}, + {140, 36112}, + {141, 36348}, + {142, 36584}, + {143, 36820}, + {144, 37056}, + {145, 37292}, + {146, 37528}, + {147, 37764}, + {148, 38000}, + {149, 38236}, + {150, 38472}, + {151, 38708}, + {152, 38944}, + {153, 39180}, + {154, 39416}, + {155, 39652}, + {156, 39888}, + {157, 40124}, + {158, 40360}, + {159, 40596}, + {160, 40832}, + {161, 41068}, + {162, 41304}, + {163, 41540}, + {164, 41776}, + {165, 42012}, + {166, 42248}, + {167, 42484}, + {168, 42720}, + {169, 42956}, + {170, 43192}, + {171, 43428}, + {172, 43664}, + {173, 43900}, + {174, 44136}, + {175, 44372}, + {176, 44569}, + {177, 44766}, + {178, 44963}, + {179, 45160}, + {180, 45357}, + {181, 45554}, + {182, 45751}, + {183, 45948}, + {184, 46145}, + {185, 46342}, + {186, 46539}, + {187, 46736}, + {188, 46933}, + {189, 47130}, + {190, 47327}, + {191, 47524}, + {192, 47721}, + {193, 47918}, + {194, 48115}, + {195, 48312}, + {196, 48509}, + {197, 48706}, + {198, 48903}, + {199, 49100}, + {200, 49297}, + {201, 49494}, + {202, 49691}, + {203, 49888}, + {204, 50085}, + {205, 50282}, + {206, 50479}, + {207, 50676}, + {208, 50873}, + {209, 51070}, + {210, 51267}, + {211, 51464}, + {212, 51661}, + {213, 51858}, + {214, 52055}, + {215, 52252}, + {216, 52449}, + {217, 52646}, + {218, 52843}, + {219, 53040}, + {220, 53237}, + {221, 53434}, + {222, 53631}, + {223, 53828}, + {224, 54025}, + {225, 54222}, + {226, 54419}, + {227, 54616}, + {228, 54813}, + {229, 55010}, + {230, 55207}, + {231, 55404}, + {232, 55601}, + {233, 55798}, + {234, 55995}, + {235, 56192}, + {236, 56389}, + {237, 56586}, + {238, 56783}, + {239, 56980}, + {240, 57177}, + {241, 57374}, + {242, 57571}, + {243, 57768}, + {244, 57965}, + {245, 58162}, + {246, 58359}, + {247, 58556}, + {248, 58753}, + {249, 58950}, + {250, 59147}, + {251, 59344}, + {252, 59541}, + {253, 59738}, + {254, 59935}, + {255, 60132}, + {256, 60329}, + {257, 60526}, + {258, 60723}, + {259, 60920}, + {260, 61117}, + {261, 61314}, + {262, 61511}, + {263, 61708}, + {264, 61905}, + {265, 62102}, + {266, 62299}, + {267, 62496}, + {268, 62693}, + {269, 62890}, + {270, 63087}, + {271, 63284}, + {272, 63362}, + {273, 63440}, + {274, 63518}, + {275, 63596}, + {276, 63674}, + {277, 63752}, + {278, 63830}, + {279, 63908}, + {280, 63986}, + {281, 64064}, + {282, 64142}, + {283, 64220}, + {284, 64298}, + {285, 64376}, + {286, 64454}, + {287, 64532}, + {288, 64610}, + {289, 64688}, + {290, 64766}, + {291, 64844}, + {292, 64922}, + {293, 65000}, + {294, 65078}, + {295, 65156}, + {296, 65234}, + {297, 65312}, + {298, 65390}, + {299, 65468}, + {300, 65546}, + {301, 65624}, + {302, 65702}, + {303, 65780}, + {304, 65858}, + {305, 65936}, + {306, 66014}, + {307, 66092}, + {308, 66170}, + {309, 66248}, + {310, 66326}, + {311, 66404}, + {312, 66482}, + {313, 66560}, + {314, 66638}, + {315, 66716}, + {316, 66794}, + {317, 66872}, + {318, 66950}, + {319, 67028}, + {320, 67106}, + {321, 67184}, + {322, 67262}, + {323, 67340}, + {324, 67418}, + {325, 67496}, + {326, 67574}, + {327, 67652}, + {328, 67730}, + {329, 67808}, + {330, 67886}, + {331, 67964}, + {332, 68042}, + {333, 68120}, + {334, 68198}, + {335, 68276}, + {336, 68354}, + {337, 68432}, + {338, 68510}, + {339, 68588}, + {340, 68666}, + {341, 68744}, + {342, 68822}, + {343, 68900}, + {344, 68978}, + {345, 69056}, + {346, 69134}, + {347, 69212}, + {348, 69290}, + {349, 69368}, + {350, 69446}, + {351, 69524}, + {352, 69602}, + {353, 69680}, + {354, 69758}, + {355, 69836}, + {356, 69914}, + {357, 69992}, + {358, 70070}, + {359, 70148}, + {360, 70226}, + {361, 70304}, + {362, 70382}, + {363, 70460}, + {364, 70538}, + {365, 70616}, + {366, 70694}, + {367, 70772}, + {368, 71160}, + {369, 71548}, + {370, 71936}, + {371, 72324}, + {372, 72712}, + {373, 73100}, + {374, 73488}, + {375, 73876}, + {376, 74264}, + {377, 74652}, + {378, 75040}, + {379, 75428}, + {380, 75816}, + {381, 76204}, + {382, 76592}, + {383, 76980}, + {384, 77368}, + {385, 77756}, + {386, 78144}, + {387, 78532}, + {388, 78920}, + {389, 79308}, + {390, 79696}, + {391, 80084}, + {392, 80398}, + {393, 80712}, + {394, 81026}, + {395, 81340}, + {396, 81654}, + {397, 81968}, + {398, 82282}, + {399, 82596}, + {400, 82910}, + {401, 83224}, + {402, 83538}, + {403, 83852}, + {404, 84166}, + {405, 84480}, + {406, 84794}, + {407, 85108}, + {408, 85422}, + {409, 85736}, + {410, 86050}, + {411, 86364}, + {412, 86678}, + {413, 86992}, + {414, 87306}, + {416, 87768}, + {433, 88796}, + {434, 88894}, + {435, 88992}, + {436, 89090}, + {437, 89188}, + {438, 89286}, + {439, 89384}, + {440, 89482}, + {441, 89580}, + {442, 89678}, + {443, 89776}, + {444, 89874}, + {445, 89972}, + {446, 90070}, + {447, 90168}, + {448, 90266}, + {449, 90364}, + {450, 90462}, + {451, 90560}, + {452, 90658}, + {453, 90756}, + {454, 90854}, + {455, 90952}, + {456, 91050}, + {543, 99172}, + {544, 99256}, + {545, 99340}, + {546, 99424}, + {547, 99508}, + {548, 99592}, + {549, 99676}, + {550, 99760}, + {551, 99844}, + {552, 99928}, + {553, 100012}, + {554, 100096}, + {555, 100180}, + {556, 100264}, + {557, 100348}, + {558, 100432}, + {559, 100516}, + {560, 100600}, + {561, 100684}, + {562, 100768}, + {563, 100852}, + {564, 100936}, + {565, 101020}, + {566, 101104}, + {567, 101188}, + {568, 101272}, + {569, 101356}, + {570, 101440}, + {571, 101524}, + {572, 101608}, + {573, 101692}, + {574, 101776}, + {575, 101860}, + {576, 101944}, + {577, 102028}, + {578, 102112}, + {579, 102196}, + {580, 102280}, + {581, 102364}, + {582, 102448}, + {583, 102532}, + {584, 102616}, + {585, 102700}, + {586, 102784}, + {587, 102868}, + {588, 102952}, + {589, 103036}, + {590, 103120}, + {595, 103636}, + {596, 103895}, + {597, 104154}, + {598, 104413}, + {599, 104672}, + {600, 104931}, + {601, 105190}, + {602, 105449}, + {603, 105708}, + {604, 105967}, + {605, 106226}, + {606, 106485}, + {607, 106744}, + {608, 107003}, + {609, 107262}, + {610, 107521}, + {611, 107780}, + {612, 108039}, + {613, 108298}, + {614, 108557}, + {615, 108816}, + {616, 109075}, + {617, 109334}, + {618, 109593}, + {640, 112259}, + {641, 112360}, + {642, 112448}, + {643, 112536}, + {644, 112624}, + {645, 112712}, + {646, 112800}, + {647, 112888}, + {648, 113400}, + {649, 113912}, + {650, 114424}, + {651, 114936}, + {652, 115448}, + {653, 115960}, + {654, 116472}, + {655, 116984}, + {656, 117496}, + {657, 118008}, + {658, 118520}, + {659, 119032}, + {660, 119544}, + {661, 120056}, + {662, 120568}, + {663, 121080}, + {664, 121592}, + {665, 122104}, + {666, 122616}, + {667, 123128}, + {668, 123640}, + {669, 124152}, + {670, 124664}, + {671, 125176}, + {672, 125688}, + {673, 126200}, + {674, 126712}, + {675, 127224}, + {676, 127736}, + {677, 128248}, + {678, 128760}, + {679, 129272}, + {680, 129784}, + {681, 130296}, + {682, 130808}, + {683, 131320}, + {684, 131832}, + {685, 132344}, + {686, 132856}, + {687, 133368}, + {688, 133880}, + {689, 134392}, + {690, 134904}, + {691, 135416}, + {692, 135928}, + {693, 136440}, + {694, 136952}, + {695, 137464}, + {696, 137976}, + {697, 138488}, + {698, 139000}, + {699, 139512}, + {700, 140024}, + {701, 140536}, + {702, 141048}, + {703, 141560}, + {704, 142072}, + {705, 142584}, + {706, 143096}, + {707, 143608}, + {708, 144120}, + {709, 144632}, + {710, 145144}, + {711, 145656}, + {712, 146168}, + {713, 146680}, + {714, 147192}, + {715, 147704}, + {716, 148216}, + {717, 148728}, + {718, 149240}, + {719, 149752}, + {720, 150264}, + {721, 150776}, + {722, 151288}, + {723, 151800}, + {724, 152312}, + {725, 152824}, + {726, 153336}, + {727, 153848}, + {728, 154360}, + {729, 154872}, + {730, 155384}, + {731, 155896}, + {732, 156408}, + {733, 156920}, + {734, 157432}, + {735, 157944}, + {736, 158456}, + {737, 158968}, + {738, 159480}, + {739, 159992}, + {740, 160504}, + {741, 161016}, + {742, 161528}, + {743, 162040}, + {744, 162552}, + {745, 163064}, + {746, 163576}, + {747, 164088}, + {748, 164600}, + {749, 165112}, + {750, 165624}, + {751, 166136}, + {752, 166648}, + {753, 167160}, + {754, 167672}, + {755, 168184}, + {756, 168696}, + {757, 169208}, + {758, 169720}, + {759, 170232}, + {760, 170744}, + {761, 171256}, + {762, 171768}, + {763, 172280}, + {764, 172792}, + {765, 173304}, + {766, 173816}, + {767, 174328}, + {768, 174840}, + {769, 175352}, + {770, 175864}, + {771, 176376}, + {772, 176888}, + {773, 177400}, + {774, 177912}, + {775, 178424}, + {776, 178936}, + {777, 179448}, + {778, 179960}, + {779, 180472}, + {780, 180984}, + {781, 181496}, + {782, 182008}, + {783, 182520}, + {784, 183032}, + {785, 183544}, + {786, 184056}, + {787, 184568}, + {788, 185080}, + {789, 185592}, + {790, 186104}, + {791, 186616}, + {792, 187128}, + {793, 187640}, + {794, 188152}, + {795, 188664}, + {796, 189176}, + {797, 189688}, + {798, 190200}, + {799, 190712}, + {800, 191224}, + {801, 191736}, + {802, 192248}, + {803, 192760}, + {804, 193272}, + {805, 193784}, + {806, 194296}, + {807, 194808}, + {808, 195320}, + {809, 195832}, + {810, 196344}, + {811, 196856}, + {812, 197368}, + {813, 197880}, + {814, 198392}, + {815, 198904}, + {816, 199416}, + {817, 199928}, + {818, 200440}, + {819, 200952}, + {820, 201464}, + {821, 201976}, + {822, 202488}, + {823, 203000}, + {824, 203512}, + {825, 204024}, + {826, 204536}, + {827, 205048}, + {828, 205560}, + {829, 206072}, + {830, 206584}, + {831, 207096}, + {832, 207608}, + {833, 208120}, + {834, 208632}, + {835, 209144}, + {836, 209656}, + {837, 210168}, + {838, 210680}, + {839, 211192}, + {840, 211704}, + {841, 212216}, + {842, 212728}, + {843, 213240}, + {844, 213752}, + {845, 214264}, + {846, 214776}, + {847, 215288}, + {848, 215800}, + {849, 216312}, + {850, 216824}, + {851, 217336}, + {852, 217848}, + {853, 218360}, + {854, 218872}, + {855, 219384}, + {856, 219896}, + {857, 220408}, + {858, 220920}, + {859, 221432}, + {860, 221944}, + {861, 222456}, + {862, 222968}, + {863, 223480}, + {864, 223992}, + {865, 224504}, + {866, 225016}, + {867, 225528}, + {868, 226040}, + {869, 226552}, + {870, 227064}, + {871, 227576}, + {872, 228088}, + {873, 228600}, + {874, 229112}, + {875, 229624}, + {876, 230136}, + {877, 230648}, + {878, 231160}, + {879, 231672}, + {880, 232184}, + {881, 232696}, + {882, 233208}, + {883, 233720}, + {884, 234232}, + {885, 234744}, + {886, 235256}, + {887, 235768}, }; GpaPaddedCounterDesc kDx12PaddedCounterByGroupGfx11[] = { @@ -3904,7 +3904,6 @@ namespace counter_dx12_gfx11 const std::set kHwDx12TimestampBlockIdsGfx11 = {887}; ///< Timestamp block id's for DX12 for gfx11 family const std::set kHwDx12TimeCounterIndicesGfx11 = {235768, 235769, 235770, 235771, 235772, 235773}; ///< Timestamp counter indices for DX12 for gfx11 family const unsigned int kHwDx12GroupCountGfx11 = static_cast(kHwDx12GroupsGfx11.size()); - const unsigned int kHwDx12ExposedCountersGroupCountGfx11 = 760; const unsigned int kDx12PaddedCounterGroupCountGfx11 = 0; const unsigned int kHwDx12SqGroupCountGfx11 = sizeof(kHwDx12SqGroupsGfx11) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx12SqIsolatedGroupCountGfx11 = sizeof(kHwDx12SqIsolatedGroupsGfx11) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.h index dfdd90cf..111a8312 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx11.h @@ -42,7 +42,6 @@ namespace counter_dx12_gfx11 extern const std::set kHwDx12TimestampBlockIdsGfx11; ///< Timestamp block id's for Dx12 for Gfx11 family extern const std::set kHwDx12TimeCounterIndicesGfx11; ///< Timestamp counter indices for Dx12 for Gfx11 family extern const unsigned int kHwDx12GroupCountGfx11; ///< Hardware Group Count for Dx12 for Gfx11 family - extern const unsigned int kHwDx12ExposedCountersGroupCountGfx11; ///< Exposed hardware counter Group Count for Dx12 for Gfx11 family extern const unsigned int kDx12PaddedCounterGroupCountGfx11; ///< reserved counter group count for Dx12 for Gfx11 family extern const unsigned int kHwDx12SqGroupCountGfx11; ///< Hardware SQ Group Count for Dx12 for Gfx11 family extern const unsigned int kHwDx12SqIsolatedGroupCountGfx11; ///< Hardware Isolated Group Count for Dx12 for Gfx11 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.cc index f23d85a5..5ea1583f 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.cc @@ -598,236 +598,236 @@ namespace counter_dx12_gfx8 }; GpaCounterGroupExposedCounterDesc kHwDx12ExposedCountersByGroupGfx8[] = { - {3, 67, {1, 9, 20, 96, 105, 124}}, - {4, 214, {1, 9, 20, 96, 105, 124}}, - {5, 361, {1, 9, 20, 96, 105, 124}}, - {6, 508, {1, 9, 20, 96, 105, 124}}, - {7, 655, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 808, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 961, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1114, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 1267, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {12, 1664, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {13, 2061, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {14, 2458, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {15, 2855, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {16, 3052, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {17, 3249, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {18, 3446, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {19, 3643, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {20, 3942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {21, 4241, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {22, 4540, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {23, 4839, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {24, 5138, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {25, 5437, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {26, 5736, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {27, 6035, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {28, 6334, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {29, 6633, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {30, 6932, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {31, 7231, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {32, 7530, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {33, 7829, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {34, 8128, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {35, 8427, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {36, 8726, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {37, 9025, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {38, 9324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {39, 9623, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {40, 9922, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {41, 10221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {42, 10520, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {43, 10819, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {44, 11118, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {45, 11417, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {46, 11716, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {47, 12015, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {48, 12314, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {49, 12613, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {50, 12912, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {51, 13211, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 13245, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 13279, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 13313, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 13347, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 13466, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 13585, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 13704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 13823, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 13942, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 14061, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 14180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 14299, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 14418, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 14537, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 14656, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 14775, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 14894, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 15013, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 15132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 15251, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 15370, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 15489, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 15608, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 15727, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 15846, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 15965, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 16084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 16203, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 16322, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 16441, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 16560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 16679, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 16798, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 16917, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 17036, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 17155, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 17274, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 17393, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 17512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 17631, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 17750, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 17869, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 17988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 18107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 18226, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 18345, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 18464, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 18583, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 18702, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 18821, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 18940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 19059, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 19178, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 19297, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 19416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 19535, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 19654, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 19773, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 19892, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 20011, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 20130, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 20249, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 20368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 20487, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 20606, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 20725, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 20844, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 24483, {3, 7, 8, 9}}, - {184, 24663, {3, 7, 8, 9}}, - {185, 24843, {3, 7, 8, 9}}, - {186, 25023, {3, 7, 8, 9}}, - {187, 25203, {3, 7, 8, 9}}, - {188, 25383, {3, 7, 8, 9}}, - {189, 25563, {3, 7, 8, 9}}, - {190, 25743, {3, 7, 8, 9}}, - {191, 25923, {3, 7, 8, 9}}, - {192, 26103, {3, 7, 8, 9}}, - {193, 26283, {3, 7, 8, 9}}, - {194, 26463, {3, 7, 8, 9}}, - {195, 26643, {3, 7, 8, 9}}, - {196, 26823, {3, 7, 8, 9}}, - {197, 27003, {3, 7, 8, 9}}, - {198, 27183, {3, 7, 8, 9}}, - {199, 27363, {3, 7, 8, 9}}, - {200, 27543, {3, 7, 8, 9}}, - {201, 27723, {3, 7, 8, 9}}, - {202, 27903, {3, 7, 8, 9}}, - {203, 28083, {3, 7, 8, 9}}, - {204, 28263, {3, 7, 8, 9}}, - {205, 28443, {3, 7, 8, 9}}, - {206, 28623, {3, 7, 8, 9}}, - {207, 28803, {3, 7, 8, 9}}, - {208, 28983, {3, 7, 8, 9}}, - {209, 29163, {3, 7, 8, 9}}, - {210, 29343, {3, 7, 8, 9}}, - {211, 29523, {3, 7, 8, 9}}, - {212, 29703, {3, 7, 8, 9}}, - {213, 29883, {3, 7, 8, 9}}, - {214, 30063, {3, 7, 8, 9}}, - {215, 30243, {3, 7, 8, 9}}, - {216, 30423, {3, 7, 8, 9}}, - {217, 30603, {3, 7, 8, 9}}, - {218, 30783, {3, 7, 8, 9}}, - {219, 30963, {3, 7, 8, 9}}, - {220, 31143, {3, 7, 8, 9}}, - {221, 31323, {3, 7, 8, 9}}, - {222, 31503, {3, 7, 8, 9}}, - {223, 31683, {3, 7, 8, 9}}, - {224, 31863, {3, 7, 8, 9}}, - {225, 32043, {3, 7, 8, 9}}, - {226, 32223, {3, 7, 8, 9}}, - {227, 32403, {3, 7, 8, 9}}, - {228, 32583, {3, 7, 8, 9}}, - {229, 32763, {3, 7, 8, 9}}, - {230, 32943, {3, 7, 8, 9}}, - {231, 33123, {3, 7, 8, 9}}, - {232, 33303, {3, 7, 8, 9}}, - {233, 33483, {3, 7, 8, 9}}, - {234, 33663, {3, 7, 8, 9}}, - {235, 33843, {3, 7, 8, 9}}, - {236, 34023, {3, 7, 8, 9}}, - {237, 34203, {3, 7, 8, 9}}, - {238, 34383, {3, 7, 8, 9}}, - {239, 34563, {3, 7, 8, 9}}, - {240, 34743, {3, 7, 8, 9}}, - {241, 34923, {3, 7, 8, 9}}, - {242, 35103, {3, 7, 8, 9}}, - {243, 35283, {3, 7, 8, 9}}, - {244, 35463, {3, 7, 8, 9}}, - {245, 35643, {3, 7, 8, 9}}, - {246, 35823, {3, 7, 8, 9}}, - {247, 36003, {18, 19, 26, 28, 35}}, - {248, 36195, {18, 19, 26, 28, 35}}, - {249, 36387, {18, 19, 26, 28, 35}}, - {250, 36579, {18, 19, 26, 28, 35}}, - {251, 36771, {18, 19, 26, 28, 35}}, - {252, 36963, {18, 19, 26, 28, 35}}, - {253, 37155, {18, 19, 26, 28, 35}}, - {254, 37347, {18, 19, 26, 28, 35}}, - {255, 37539, {18, 19, 26, 28, 35}}, - {256, 37731, {18, 19, 26, 28, 35}}, - {257, 37923, {18, 19, 26, 28, 35}}, - {258, 38115, {18, 19, 26, 28, 35}}, - {259, 38307, {18, 19, 26, 28, 35}}, - {260, 38499, {18, 19, 26, 28, 35}}, - {261, 38691, {18, 19, 26, 28, 35}}, - {262, 38883, {18, 19, 26, 28, 35}}, - {265, 39145, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39402, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39659, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39916, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40173, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40430, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40687, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 40944, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41201, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41458, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 41715, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 41972, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42229, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 42486, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 42743, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43000, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 43257, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 43653, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 44049, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 44445, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 44841, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 45237, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 45633, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 46029, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 46425, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 46821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 47217, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 47613, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 48009, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 48405, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 48801, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 49197, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {299, 49741, {0, 2}}, - {342, 51131, {0, 1, 2, 3, 4, 5}}, + {3, 67}, + {4, 214}, + {5, 361}, + {6, 508}, + {7, 655}, + {8, 808}, + {9, 961}, + {10, 1114}, + {11, 1267}, + {12, 1664}, + {13, 2061}, + {14, 2458}, + {15, 2855}, + {16, 3052}, + {17, 3249}, + {18, 3446}, + {19, 3643}, + {20, 3942}, + {21, 4241}, + {22, 4540}, + {23, 4839}, + {24, 5138}, + {25, 5437}, + {26, 5736}, + {27, 6035}, + {28, 6334}, + {29, 6633}, + {30, 6932}, + {31, 7231}, + {32, 7530}, + {33, 7829}, + {34, 8128}, + {35, 8427}, + {36, 8726}, + {37, 9025}, + {38, 9324}, + {39, 9623}, + {40, 9922}, + {41, 10221}, + {42, 10520}, + {43, 10819}, + {44, 11118}, + {45, 11417}, + {46, 11716}, + {47, 12015}, + {48, 12314}, + {49, 12613}, + {50, 12912}, + {51, 13211}, + {52, 13245}, + {53, 13279}, + {54, 13313}, + {55, 13347}, + {56, 13466}, + {57, 13585}, + {58, 13704}, + {59, 13823}, + {60, 13942}, + {61, 14061}, + {62, 14180}, + {63, 14299}, + {64, 14418}, + {65, 14537}, + {66, 14656}, + {67, 14775}, + {68, 14894}, + {69, 15013}, + {70, 15132}, + {71, 15251}, + {72, 15370}, + {73, 15489}, + {74, 15608}, + {75, 15727}, + {76, 15846}, + {77, 15965}, + {78, 16084}, + {79, 16203}, + {80, 16322}, + {81, 16441}, + {82, 16560}, + {83, 16679}, + {84, 16798}, + {85, 16917}, + {86, 17036}, + {87, 17155}, + {88, 17274}, + {89, 17393}, + {90, 17512}, + {91, 17631}, + {92, 17750}, + {93, 17869}, + {94, 17988}, + {95, 18107}, + {96, 18226}, + {97, 18345}, + {98, 18464}, + {99, 18583}, + {100, 18702}, + {101, 18821}, + {102, 18940}, + {103, 19059}, + {104, 19178}, + {105, 19297}, + {106, 19416}, + {107, 19535}, + {108, 19654}, + {109, 19773}, + {110, 19892}, + {111, 20011}, + {112, 20130}, + {113, 20249}, + {114, 20368}, + {115, 20487}, + {116, 20606}, + {117, 20725}, + {118, 20844}, + {183, 24483}, + {184, 24663}, + {185, 24843}, + {186, 25023}, + {187, 25203}, + {188, 25383}, + {189, 25563}, + {190, 25743}, + {191, 25923}, + {192, 26103}, + {193, 26283}, + {194, 26463}, + {195, 26643}, + {196, 26823}, + {197, 27003}, + {198, 27183}, + {199, 27363}, + {200, 27543}, + {201, 27723}, + {202, 27903}, + {203, 28083}, + {204, 28263}, + {205, 28443}, + {206, 28623}, + {207, 28803}, + {208, 28983}, + {209, 29163}, + {210, 29343}, + {211, 29523}, + {212, 29703}, + {213, 29883}, + {214, 30063}, + {215, 30243}, + {216, 30423}, + {217, 30603}, + {218, 30783}, + {219, 30963}, + {220, 31143}, + {221, 31323}, + {222, 31503}, + {223, 31683}, + {224, 31863}, + {225, 32043}, + {226, 32223}, + {227, 32403}, + {228, 32583}, + {229, 32763}, + {230, 32943}, + {231, 33123}, + {232, 33303}, + {233, 33483}, + {234, 33663}, + {235, 33843}, + {236, 34023}, + {237, 34203}, + {238, 34383}, + {239, 34563}, + {240, 34743}, + {241, 34923}, + {242, 35103}, + {243, 35283}, + {244, 35463}, + {245, 35643}, + {246, 35823}, + {247, 36003}, + {248, 36195}, + {249, 36387}, + {250, 36579}, + {251, 36771}, + {252, 36963}, + {253, 37155}, + {254, 37347}, + {255, 37539}, + {256, 37731}, + {257, 37923}, + {258, 38115}, + {259, 38307}, + {260, 38499}, + {261, 38691}, + {262, 38883}, + {265, 39145}, + {266, 39402}, + {267, 39659}, + {268, 39916}, + {269, 40173}, + {270, 40430}, + {271, 40687}, + {272, 40944}, + {273, 41201}, + {274, 41458}, + {275, 41715}, + {276, 41972}, + {277, 42229}, + {278, 42486}, + {279, 42743}, + {280, 43000}, + {281, 43257}, + {282, 43653}, + {283, 44049}, + {284, 44445}, + {285, 44841}, + {286, 45237}, + {287, 45633}, + {288, 46029}, + {289, 46425}, + {290, 46821}, + {291, 47217}, + {292, 47613}, + {293, 48009}, + {294, 48405}, + {295, 48801}, + {296, 49197}, + {299, 49741}, + {342, 51131}, }; GpaPaddedCounterDesc kDx12PaddedCounterByGroupGfx8[] = { @@ -1438,7 +1438,6 @@ namespace counter_dx12_gfx8 const std::set kHwDx12TimestampBlockIdsGfx8 = {342}; ///< Timestamp block id's for DX12 for gfx8 family const std::set kHwDx12TimeCounterIndicesGfx8 = {51131, 51132, 51133, 51134, 51135, 51136}; ///< Timestamp counter indices for DX12 for gfx8 family const unsigned int kHwDx12GroupCountGfx8 = static_cast(kHwDx12GroupsGfx8.size()); - const unsigned int kHwDx12ExposedCountersGroupCountGfx8 = 230; const unsigned int kDx12PaddedCounterGroupCountGfx8 = 0; const unsigned int kHwDx12SqGroupCountGfx8 = sizeof(kHwDx12SqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx12SqIsolatedGroupCountGfx8 = sizeof(kHwDx12SqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.h index a2b513b7..ebe50444 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx8.h @@ -42,7 +42,6 @@ namespace counter_dx12_gfx8 extern const std::set kHwDx12TimestampBlockIdsGfx8; ///< Timestamp block id's for Dx12 for Gfx8 family extern const std::set kHwDx12TimeCounterIndicesGfx8; ///< Timestamp counter indices for Dx12 for Gfx8 family extern const unsigned int kHwDx12GroupCountGfx8; ///< Hardware Group Count for Dx12 for Gfx8 family - extern const unsigned int kHwDx12ExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Dx12 for Gfx8 family extern const unsigned int kDx12PaddedCounterGroupCountGfx8; ///< reserved counter group count for Dx12 for Gfx8 family extern const unsigned int kHwDx12SqGroupCountGfx8; ///< Hardware SQ Group Count for Dx12 for Gfx8 family extern const unsigned int kHwDx12SqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Dx12 for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.cc index 22f17e7c..0080979c 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.cc @@ -674,269 +674,269 @@ namespace counter_dx12_gfx9 }; GpaCounterGroupExposedCounterDesc kHwDx12ExposedCountersByGroupGfx9[] = { - {0, 0, {0, 23}}, - {3, 96, {1, 9, 105, 114, 125, 146}}, - {4, 244, {1, 9, 105, 114, 125, 146}}, - {5, 392, {1, 9, 105, 114, 125, 146}}, - {6, 540, {1, 9, 105, 114, 125, 146}}, - {7, 688, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 1039, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 1390, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1741, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 2092, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 2584, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 3076, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 3568, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 4060, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {16, 4256, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {17, 4452, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {18, 4648, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {19, 4844, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {20, 5218, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {21, 5592, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {22, 5966, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {23, 6340, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {24, 6714, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {25, 7088, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {26, 7462, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {27, 7836, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {28, 8210, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {29, 8584, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {30, 8958, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {31, 9332, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {32, 9706, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {33, 10080, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {34, 10454, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {35, 10828, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {36, 11202, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {37, 11576, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {38, 11950, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {39, 12324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {40, 12698, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {41, 13072, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {42, 13446, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {43, 13820, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {44, 14194, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {45, 14568, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {46, 14942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {47, 15316, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {48, 15690, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {49, 16064, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {50, 16438, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {51, 16812, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 17020, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 17228, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 17436, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 17644, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 17763, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 17882, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 18001, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 18120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 18239, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 18358, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 18477, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 18596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 18715, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 18834, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 18953, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 19072, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 19191, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 19310, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 19429, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 19548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 19667, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 19786, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 19905, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 20024, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 20143, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 20262, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 20381, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 20500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 20619, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 20738, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 20857, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 20976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 21095, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 21214, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 21333, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 21452, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 21571, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 21690, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 21809, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 21928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 22047, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 22166, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 22285, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 22404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 22523, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 22642, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 22761, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 22880, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 22999, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 23118, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 23237, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 23356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 23475, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 23594, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 23713, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 23832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 23951, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 24070, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 24189, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 24308, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 24427, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 24546, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 24665, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 24903, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 25022, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 25141, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 28908, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {184, 28993, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {185, 29078, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {186, 29163, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {187, 29248, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {188, 29333, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {189, 29418, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {190, 29503, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {191, 29588, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {192, 29673, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {193, 29758, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {194, 29843, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {195, 29928, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {196, 30013, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {197, 30098, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {198, 30183, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {199, 30268, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {200, 30353, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {201, 30438, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {202, 30523, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {203, 30608, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {204, 30693, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {205, 30778, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {206, 30863, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {207, 30948, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {208, 31033, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {209, 31118, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {210, 31203, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {211, 31288, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {212, 31373, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {213, 31458, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {214, 31543, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {215, 31628, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {216, 31713, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {217, 31798, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {218, 31883, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {219, 31968, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {220, 32053, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {221, 32138, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {222, 32223, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {223, 32308, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {224, 32393, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {225, 32478, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {226, 32563, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {227, 32648, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {228, 32733, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {229, 32818, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {230, 32903, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {231, 32988, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {232, 33073, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {233, 33158, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {234, 33243, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {235, 33328, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {236, 33413, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {237, 33498, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {238, 33583, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {239, 33668, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {240, 33753, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {241, 33838, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {242, 33923, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {243, 34008, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {244, 34093, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {245, 34178, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {246, 34263, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {247, 34348, {20, 22, 29, 30, 33, 41, 42}}, - {248, 34630, {20, 22, 29, 30, 33, 41, 42}}, - {249, 34912, {20, 22, 29, 30, 33, 41, 42}}, - {250, 35194, {20, 22, 29, 30, 33, 41, 42}}, - {251, 35476, {20, 22, 29, 30, 33, 41, 42}}, - {252, 35758, {20, 22, 29, 30, 33, 41, 42}}, - {253, 36040, {20, 22, 29, 30, 33, 41, 42}}, - {254, 36322, {20, 22, 29, 30, 33, 41, 42}}, - {255, 36604, {20, 22, 29, 30, 33, 41, 42}}, - {256, 36886, {20, 22, 29, 30, 33, 41, 42}}, - {257, 37168, {20, 22, 29, 30, 33, 41, 42}}, - {258, 37450, {20, 22, 29, 30, 33, 41, 42}}, - {259, 37732, {20, 22, 29, 30, 33, 41, 42}}, - {260, 38014, {20, 22, 29, 30, 33, 41, 42}}, - {261, 38296, {20, 22, 29, 30, 33, 41, 42}}, - {262, 38578, {20, 22, 29, 30, 33, 41, 42}}, - {265, 38930, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39258, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39586, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39914, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40242, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40898, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 41226, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41554, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41882, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 42210, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 42538, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42866, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 43194, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 43522, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43850, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 44178, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 44622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 45066, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 45510, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 45954, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 46398, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 46842, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 47286, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 47730, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 48174, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 48618, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 49062, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 49506, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 49950, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 50394, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 50838, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {298, 51403, {0, 2}}, - {312, 51912, {55, 57}}, - {313, 51995, {55, 57}}, - {314, 52078, {55, 57}}, - {315, 52161, {55, 57}}, - {316, 52244, {55, 57}}, - {317, 52327, {55, 57}}, - {318, 52410, {55, 57}}, - {319, 52493, {55, 57}}, - {320, 52576, {55, 57}}, - {321, 52659, {55, 57}}, - {322, 52742, {55, 57}}, - {323, 52825, {55, 57}}, - {324, 52908, {55, 57}}, - {325, 52991, {55, 57}}, - {326, 53074, {55, 57}}, - {327, 53157, {55, 57}}, - {328, 53240, {55, 57}}, - {329, 53323, {55, 57}}, - {330, 53406, {55, 57}}, - {331, 53489, {55, 57}}, - {332, 53572, {55, 57}}, - {333, 53655, {55, 57}}, - {334, 53738, {55, 57}}, - {335, 53821, {55, 57}}, - {336, 53904, {55, 57}}, - {337, 53987, {55, 57}}, - {338, 54070, {55, 57}}, - {339, 54153, {55, 57}}, - {340, 54236, {55, 57}}, - {341, 54319, {55, 57}}, - {342, 54402, {55, 57}}, - {343, 54485, {55, 57}}, - {385, 57999, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {3, 96}, + {4, 244}, + {5, 392}, + {6, 540}, + {7, 688}, + {8, 1039}, + {9, 1390}, + {10, 1741}, + {11, 2092}, + {12, 2584}, + {13, 3076}, + {14, 3568}, + {15, 4060}, + {16, 4256}, + {17, 4452}, + {18, 4648}, + {19, 4844}, + {20, 5218}, + {21, 5592}, + {22, 5966}, + {23, 6340}, + {24, 6714}, + {25, 7088}, + {26, 7462}, + {27, 7836}, + {28, 8210}, + {29, 8584}, + {30, 8958}, + {31, 9332}, + {32, 9706}, + {33, 10080}, + {34, 10454}, + {35, 10828}, + {36, 11202}, + {37, 11576}, + {38, 11950}, + {39, 12324}, + {40, 12698}, + {41, 13072}, + {42, 13446}, + {43, 13820}, + {44, 14194}, + {45, 14568}, + {46, 14942}, + {47, 15316}, + {48, 15690}, + {49, 16064}, + {50, 16438}, + {51, 16812}, + {52, 17020}, + {53, 17228}, + {54, 17436}, + {55, 17644}, + {56, 17763}, + {57, 17882}, + {58, 18001}, + {59, 18120}, + {60, 18239}, + {61, 18358}, + {62, 18477}, + {63, 18596}, + {64, 18715}, + {65, 18834}, + {66, 18953}, + {67, 19072}, + {68, 19191}, + {69, 19310}, + {70, 19429}, + {71, 19548}, + {72, 19667}, + {73, 19786}, + {74, 19905}, + {75, 20024}, + {76, 20143}, + {77, 20262}, + {78, 20381}, + {79, 20500}, + {80, 20619}, + {81, 20738}, + {82, 20857}, + {83, 20976}, + {84, 21095}, + {85, 21214}, + {86, 21333}, + {87, 21452}, + {88, 21571}, + {89, 21690}, + {90, 21809}, + {91, 21928}, + {92, 22047}, + {93, 22166}, + {94, 22285}, + {95, 22404}, + {96, 22523}, + {97, 22642}, + {98, 22761}, + {99, 22880}, + {100, 22999}, + {101, 23118}, + {102, 23237}, + {103, 23356}, + {104, 23475}, + {105, 23594}, + {106, 23713}, + {107, 23832}, + {108, 23951}, + {109, 24070}, + {110, 24189}, + {111, 24308}, + {112, 24427}, + {113, 24546}, + {114, 24665}, + {115, 24784}, + {116, 24903}, + {117, 25022}, + {118, 25141}, + {183, 28908}, + {184, 28993}, + {185, 29078}, + {186, 29163}, + {187, 29248}, + {188, 29333}, + {189, 29418}, + {190, 29503}, + {191, 29588}, + {192, 29673}, + {193, 29758}, + {194, 29843}, + {195, 29928}, + {196, 30013}, + {197, 30098}, + {198, 30183}, + {199, 30268}, + {200, 30353}, + {201, 30438}, + {202, 30523}, + {203, 30608}, + {204, 30693}, + {205, 30778}, + {206, 30863}, + {207, 30948}, + {208, 31033}, + {209, 31118}, + {210, 31203}, + {211, 31288}, + {212, 31373}, + {213, 31458}, + {214, 31543}, + {215, 31628}, + {216, 31713}, + {217, 31798}, + {218, 31883}, + {219, 31968}, + {220, 32053}, + {221, 32138}, + {222, 32223}, + {223, 32308}, + {224, 32393}, + {225, 32478}, + {226, 32563}, + {227, 32648}, + {228, 32733}, + {229, 32818}, + {230, 32903}, + {231, 32988}, + {232, 33073}, + {233, 33158}, + {234, 33243}, + {235, 33328}, + {236, 33413}, + {237, 33498}, + {238, 33583}, + {239, 33668}, + {240, 33753}, + {241, 33838}, + {242, 33923}, + {243, 34008}, + {244, 34093}, + {245, 34178}, + {246, 34263}, + {247, 34348}, + {248, 34630}, + {249, 34912}, + {250, 35194}, + {251, 35476}, + {252, 35758}, + {253, 36040}, + {254, 36322}, + {255, 36604}, + {256, 36886}, + {257, 37168}, + {258, 37450}, + {259, 37732}, + {260, 38014}, + {261, 38296}, + {262, 38578}, + {265, 38930}, + {266, 39258}, + {267, 39586}, + {268, 39914}, + {269, 40242}, + {270, 40570}, + {271, 40898}, + {272, 41226}, + {273, 41554}, + {274, 41882}, + {275, 42210}, + {276, 42538}, + {277, 42866}, + {278, 43194}, + {279, 43522}, + {280, 43850}, + {281, 44178}, + {282, 44622}, + {283, 45066}, + {284, 45510}, + {285, 45954}, + {286, 46398}, + {287, 46842}, + {288, 47286}, + {289, 47730}, + {290, 48174}, + {291, 48618}, + {292, 49062}, + {293, 49506}, + {294, 49950}, + {295, 50394}, + {296, 50838}, + {298, 51403}, + {312, 51912}, + {313, 51995}, + {314, 52078}, + {315, 52161}, + {316, 52244}, + {317, 52327}, + {318, 52410}, + {319, 52493}, + {320, 52576}, + {321, 52659}, + {322, 52742}, + {323, 52825}, + {324, 52908}, + {325, 52991}, + {326, 53074}, + {327, 53157}, + {328, 53240}, + {329, 53323}, + {330, 53406}, + {331, 53489}, + {332, 53572}, + {333, 53655}, + {334, 53738}, + {335, 53821}, + {336, 53904}, + {337, 53987}, + {338, 54070}, + {339, 54153}, + {340, 54236}, + {341, 54319}, + {342, 54402}, + {343, 54485}, + {385, 57999}, }; GpaPaddedCounterDesc kDx12PaddedCounterByGroupGfx9[] = { @@ -1662,7 +1662,6 @@ namespace counter_dx12_gfx9 const std::set kHwDx12TimestampBlockIdsGfx9 = {385}; ///< Timestamp block id's for DX12 for gfx9 family const std::set kHwDx12TimeCounterIndicesGfx9 = {57999, 58000, 58001, 58002, 58003, 58004}; ///< Timestamp counter indices for DX12 for gfx9 family const unsigned int kHwDx12GroupCountGfx9 = static_cast(kHwDx12GroupsGfx9.size()); - const unsigned int kHwDx12ExposedCountersGroupCountGfx9 = 263; const unsigned int kDx12PaddedCounterGroupCountGfx9 = 73; const unsigned int kHwDx12SqGroupCountGfx9 = sizeof(kHwDx12SqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwDx12SqIsolatedGroupCountGfx9 = sizeof(kHwDx12SqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.h index 820c4fb3..6d3ff8c6 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_dx12_gfx9.h @@ -42,7 +42,6 @@ namespace counter_dx12_gfx9 extern const std::set kHwDx12TimestampBlockIdsGfx9; ///< Timestamp block id's for Dx12 for Gfx9 family extern const std::set kHwDx12TimeCounterIndicesGfx9; ///< Timestamp counter indices for Dx12 for Gfx9 family extern const unsigned int kHwDx12GroupCountGfx9; ///< Hardware Group Count for Dx12 for Gfx9 family - extern const unsigned int kHwDx12ExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Dx12 for Gfx9 family extern const unsigned int kDx12PaddedCounterGroupCountGfx9; ///< reserved counter group count for Dx12 for Gfx9 family extern const unsigned int kHwDx12SqGroupCountGfx9; ///< Hardware SQ Group Count for Dx12 for Gfx9 family extern const unsigned int kHwDx12SqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Dx12 for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl.cmake index 46374541..8c7aec7e 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS_GL diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.cc index 46ab5ba0..c6832da9 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.cc @@ -212,80 +212,80 @@ namespace counter_gl_gfx10 }; GpaCounterGroupExposedCounterDesc kHwGlExposedCountersByGroupGfx10[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 461, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 922, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1383, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1844, {0, 24}}, - {5, 1884, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2254, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2624, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2994, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3364, {0, 2}}, - {11, 3430, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3696, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4248, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 4800, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 5129, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 5641, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 6153, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 6665, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 7177, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 7689, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 8201, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 8713, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 9225, {12, 14, 17, 19, 22, 24, 27, 29}}, - {24, 9450, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 9676, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 9902, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 10128, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 10354, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 10580, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 10806, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 11032, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 11258, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 11484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 11710, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 11936, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 12162, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 12388, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 12614, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {39, 12840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 14042, {9, 18, 36, 44, 45, 46}}, - {57, 14119, {9, 18, 36, 44, 45, 46}}, - {58, 14196, {9, 18, 36, 44, 45, 46}}, - {59, 14273, {9, 18, 36, 44, 45, 46}}, - {60, 14350, {9, 18, 36, 44, 45, 46}}, - {61, 14427, {9, 18, 36, 44, 45, 46}}, - {62, 14504, {9, 18, 36, 44, 45, 46}}, - {63, 14581, {9, 18, 36, 44, 45, 46}}, - {64, 14658, {9, 18, 36, 44, 45, 46}}, - {65, 14735, {9, 18, 36, 44, 45, 46}}, - {66, 14812, {9, 18, 36, 44, 45, 46}}, - {67, 14889, {9, 18, 36, 44, 45, 46}}, - {68, 14966, {9, 18, 36, 44, 45, 46}}, - {69, 15043, {9, 18, 36, 44, 45, 46}}, - {70, 15120, {9, 18, 36, 44, 45, 46}}, - {71, 15197, {9, 18, 36, 44, 45, 46}}, - {75, 15526, {211, 221, 227, 247, 275}}, - {77, 15877, {14, 18}}, - {82, 16305, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {83, 16540, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {84, 16775, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {85, 17010, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {86, 17245, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {87, 17480, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {88, 17715, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {89, 17950, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {90, 18185, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {91, 18420, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {92, 18655, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {93, 18890, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {94, 19125, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {95, 19360, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {96, 19595, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {97, 19830, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {112, 23224, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 461}, + {2, 922}, + {3, 1383}, + {4, 1844}, + {5, 1884}, + {6, 2254}, + {7, 2624}, + {8, 2994}, + {9, 3364}, + {11, 3430}, + {12, 3696}, + {13, 4248}, + {14, 4800}, + {15, 5129}, + {16, 5641}, + {17, 6153}, + {18, 6665}, + {19, 7177}, + {20, 7689}, + {21, 8201}, + {22, 8713}, + {23, 9225}, + {24, 9450}, + {25, 9676}, + {26, 9902}, + {27, 10128}, + {28, 10354}, + {29, 10580}, + {30, 10806}, + {31, 11032}, + {32, 11258}, + {33, 11484}, + {34, 11710}, + {35, 11936}, + {36, 12162}, + {37, 12388}, + {38, 12614}, + {39, 12840}, + {56, 14042}, + {57, 14119}, + {58, 14196}, + {59, 14273}, + {60, 14350}, + {61, 14427}, + {62, 14504}, + {63, 14581}, + {64, 14658}, + {65, 14735}, + {66, 14812}, + {67, 14889}, + {68, 14966}, + {69, 15043}, + {70, 15120}, + {71, 15197}, + {75, 15526}, + {77, 15877}, + {82, 16305}, + {83, 16540}, + {84, 16775}, + {85, 17010}, + {86, 17245}, + {87, 17480}, + {88, 17715}, + {89, 17950}, + {90, 18185}, + {91, 18420}, + {92, 18655}, + {93, 18890}, + {94, 19125}, + {95, 19360}, + {96, 19595}, + {97, 19830}, + {112, 23224}, }; GpaPaddedCounterDesc kGlPaddedCounterByGroupGfx10[] = { @@ -364,7 +364,6 @@ namespace counter_gl_gfx10 const std::set kHwGlTimestampBlockIdsGfx10 = {112}; ///< Timestamp block id's for GL for gfx10 family const std::set kHwGlTimeCounterIndicesGfx10 = {23224, 23225, 23226, 23227, 23228, 23229}; ///< Timestamp counter indices for GL for gfx10 family const unsigned int kHwGlGroupCountGfx10 = static_cast(kHwGlGroupsGfx10.size()); - const unsigned int kHwGlExposedCountersGroupCountGfx10 = 74; const unsigned int kGlPaddedCounterGroupCountGfx10 = 0; const unsigned int kHwGlSqGroupCountGfx10 = sizeof(kHwGlSqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwGlSqIsolatedGroupCountGfx10 = sizeof(kHwGlSqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.h index 31ec6651..b3e84cc9 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx10.h @@ -35,7 +35,6 @@ namespace counter_gl_gfx10 extern const std::set kHwGlTimestampBlockIdsGfx10; ///< Timestamp block id's for Gl for Gfx10 family extern const std::set kHwGlTimeCounterIndicesGfx10; ///< Timestamp counter indices for Gl for Gfx10 family extern const unsigned int kHwGlGroupCountGfx10; ///< Hardware Group Count for Gl for Gfx10 family - extern const unsigned int kHwGlExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Gl for Gfx10 family extern const unsigned int kGlPaddedCounterGroupCountGfx10; ///< reserved counter group count for Gl for Gfx10 family extern const unsigned int kHwGlSqGroupCountGfx10; ///< Hardware SQ Group Count for Gl for Gfx10 family extern const unsigned int kHwGlSqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Gl for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.cc index 716203d0..e32eb882 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.cc @@ -231,97 +231,97 @@ namespace counter_gl_gfx103 }; GpaCounterGroupExposedCounterDesc kHwGlExposedCountersByGroupGfx103[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 453, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 906, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1359, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1812, {0, 24}}, - {5, 1852, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2243, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2634, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 3025, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3416, {0, 2}}, - {11, 3482, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3758, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4336, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 4914, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 5246, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 5758, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 6270, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 6782, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 7294, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 7806, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 8318, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 8830, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 9342, {12, 14, 17, 19, 22, 24, 27, 29}}, - {24, 9567, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {25, 9803, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {26, 10039, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {27, 10275, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {28, 10511, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {29, 10747, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {30, 10983, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {31, 11219, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {32, 11455, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {33, 11691, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {34, 11927, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {35, 12163, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {36, 12399, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {37, 12635, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {38, 12871, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {39, 13107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {40, 13343, {82, 116, 117, 118}}, - {41, 13535, {82, 116, 117, 118}}, - {42, 13727, {82, 116, 117, 118}}, - {43, 13919, {82, 116, 117, 118}}, - {44, 14111, {82, 116, 117, 118}}, - {45, 14303, {82, 116, 117, 118}}, - {46, 14495, {82, 116, 117, 118}}, - {47, 14687, {82, 116, 117, 118}}, - {48, 14879, {82, 116, 117, 118}}, - {49, 15071, {82, 116, 117, 118}}, - {50, 15263, {82, 116, 117, 118}}, - {51, 15455, {82, 116, 117, 118}}, - {52, 15647, {82, 116, 117, 118}}, - {53, 15839, {82, 116, 117, 118}}, - {54, 16031, {82, 116, 117, 118}}, - {55, 16223, {82, 116, 117, 118}}, - {56, 16415, {9, 18, 36, 43, 44, 45}}, - {57, 16476, {9, 18, 36, 43, 44, 45}}, - {58, 16537, {9, 18, 36, 43, 44, 45}}, - {59, 16598, {9, 18, 36, 43, 44, 45}}, - {60, 16659, {9, 18, 36, 43, 44, 45}}, - {61, 16720, {9, 18, 36, 43, 44, 45}}, - {62, 16781, {9, 18, 36, 43, 44, 45}}, - {63, 16842, {9, 18, 36, 43, 44, 45}}, - {64, 16903, {9, 18, 36, 43, 44, 45}}, - {65, 16964, {9, 18, 36, 43, 44, 45}}, - {66, 17025, {9, 18, 36, 43, 44, 45}}, - {67, 17086, {9, 18, 36, 43, 44, 45}}, - {68, 17147, {9, 18, 36, 43, 44, 45}}, - {69, 17208, {9, 18, 36, 43, 44, 45}}, - {70, 17269, {9, 18, 36, 43, 44, 45}}, - {71, 17330, {9, 18, 36, 43, 44, 45}}, - {77, 17705, {14, 18}}, - {82, 18152, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {83, 18406, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {84, 18660, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {85, 18914, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {86, 19168, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {87, 19422, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {88, 19676, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {89, 19930, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {90, 20184, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {91, 20438, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {92, 20692, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {93, 20946, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {94, 21200, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {95, 21454, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {96, 21708, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {97, 21962, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {111, 25413, {42}}, - {112, 25476, {4, 73, 80, 86, 111}}, - {114, 25620, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 453}, + {2, 906}, + {3, 1359}, + {4, 1812}, + {5, 1852}, + {6, 2243}, + {7, 2634}, + {8, 3025}, + {9, 3416}, + {11, 3482}, + {12, 3758}, + {13, 4336}, + {14, 4914}, + {15, 5246}, + {16, 5758}, + {17, 6270}, + {18, 6782}, + {19, 7294}, + {20, 7806}, + {21, 8318}, + {22, 8830}, + {23, 9342}, + {24, 9567}, + {25, 9803}, + {26, 10039}, + {27, 10275}, + {28, 10511}, + {29, 10747}, + {30, 10983}, + {31, 11219}, + {32, 11455}, + {33, 11691}, + {34, 11927}, + {35, 12163}, + {36, 12399}, + {37, 12635}, + {38, 12871}, + {39, 13107}, + {40, 13343}, + {41, 13535}, + {42, 13727}, + {43, 13919}, + {44, 14111}, + {45, 14303}, + {46, 14495}, + {47, 14687}, + {48, 14879}, + {49, 15071}, + {50, 15263}, + {51, 15455}, + {52, 15647}, + {53, 15839}, + {54, 16031}, + {55, 16223}, + {56, 16415}, + {57, 16476}, + {58, 16537}, + {59, 16598}, + {60, 16659}, + {61, 16720}, + {62, 16781}, + {63, 16842}, + {64, 16903}, + {65, 16964}, + {66, 17025}, + {67, 17086}, + {68, 17147}, + {69, 17208}, + {70, 17269}, + {71, 17330}, + {77, 17705}, + {82, 18152}, + {83, 18406}, + {84, 18660}, + {85, 18914}, + {86, 19168}, + {87, 19422}, + {88, 19676}, + {89, 19930}, + {90, 20184}, + {91, 20438}, + {92, 20692}, + {93, 20946}, + {94, 21200}, + {95, 21454}, + {96, 21708}, + {97, 21962}, + {111, 25413}, + {112, 25476}, + {114, 25620}, }; GpaPaddedCounterDesc kGlPaddedCounterByGroupGfx103[] = { @@ -400,7 +400,6 @@ namespace counter_gl_gfx103 const std::set kHwGlTimestampBlockIdsGfx103 = {114}; ///< Timestamp block id's for GL for gfx103 family const std::set kHwGlTimeCounterIndicesGfx103 = {25620, 25621, 25622, 25623, 25624, 25625}; ///< Timestamp counter indices for GL for gfx103 family const unsigned int kHwGlGroupCountGfx103 = static_cast(kHwGlGroupsGfx103.size()); - const unsigned int kHwGlExposedCountersGroupCountGfx103 = 91; const unsigned int kGlPaddedCounterGroupCountGfx103 = 0; const unsigned int kHwGlSqGroupCountGfx103 = sizeof(kHwGlSqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwGlSqIsolatedGroupCountGfx103 = sizeof(kHwGlSqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.h index 045c5cf4..da08125c 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx103.h @@ -35,7 +35,6 @@ namespace counter_gl_gfx103 extern const std::set kHwGlTimestampBlockIdsGfx103; ///< Timestamp block id's for Gl for Gfx103 family extern const std::set kHwGlTimeCounterIndicesGfx103; ///< Timestamp counter indices for Gl for Gfx103 family extern const unsigned int kHwGlGroupCountGfx103; ///< Hardware Group Count for Gl for Gfx103 family - extern const unsigned int kHwGlExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Gl for Gfx103 family extern const unsigned int kGlPaddedCounterGroupCountGfx103; ///< reserved counter group count for Gl for Gfx103 family extern const unsigned int kHwGlSqGroupCountGfx103; ///< Hardware SQ Group Count for Gl for Gfx103 family extern const unsigned int kHwGlSqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Gl for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.cc index dbf784a7..1b729ad5 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.cc @@ -195,77 +195,77 @@ namespace counter_gl_gfx8 }; GpaCounterGroupExposedCounterDesc kHwGlExposedCountersByGroupGfx8[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 396, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 792, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1188, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {5, 1603, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 1860, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2117, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2374, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 2631, {0, 2}}, - {11, 2680, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 2833, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {13, 3230, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {14, 3427, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {15, 3726, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {16, 4025, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {17, 4324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {18, 4623, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {19, 4922, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {20, 5221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {21, 5520, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {22, 5819, {12, 14, 17, 19, 22, 24, 27, 29}}, - {23, 5853, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {24, 5972, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 6091, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 6210, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 6329, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 6448, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 6567, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 6686, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 6805, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 6924, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 7043, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 7162, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 7281, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 7400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 7519, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 7638, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 7827, {18, 19, 26, 28, 35}}, - {42, 8019, {18, 19, 26, 28, 35}}, - {43, 8211, {18, 19, 26, 28, 35}}, - {44, 8403, {18, 19, 26, 28, 35}}, - {45, 8595, {18, 19, 26, 28, 35}}, - {46, 8787, {18, 19, 26, 28, 35}}, - {47, 8979, {18, 19, 26, 28, 35}}, - {48, 9171, {18, 19, 26, 28, 35}}, - {49, 9363, {18, 19, 26, 28, 35}}, - {50, 9555, {18, 19, 26, 28, 35}}, - {51, 9747, {18, 19, 26, 28, 35}}, - {52, 9939, {18, 19, 26, 28, 35}}, - {53, 10131, {18, 19, 26, 28, 35}}, - {54, 10323, {18, 19, 26, 28, 35}}, - {55, 10515, {18, 19, 26, 28, 35}}, - {56, 10707, {18, 19, 26, 28, 35}}, - {73, 11779, {3, 7, 8, 9}}, - {74, 11959, {3, 7, 8, 9}}, - {75, 12139, {3, 7, 8, 9}}, - {76, 12319, {3, 7, 8, 9}}, - {77, 12499, {3, 7, 8, 9}}, - {78, 12679, {3, 7, 8, 9}}, - {79, 12859, {3, 7, 8, 9}}, - {80, 13039, {3, 7, 8, 9}}, - {81, 13219, {3, 7, 8, 9}}, - {82, 13399, {3, 7, 8, 9}}, - {83, 13579, {3, 7, 8, 9}}, - {84, 13759, {3, 7, 8, 9}}, - {85, 13939, {3, 7, 8, 9}}, - {86, 14119, {3, 7, 8, 9}}, - {87, 14299, {3, 7, 8, 9}}, - {88, 14479, {3, 7, 8, 9}}, - {90, 14780, {1, 9, 20, 96, 105, 124}}, - {98, 15125, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 396}, + {2, 792}, + {3, 1188}, + {5, 1603}, + {6, 1860}, + {7, 2117}, + {8, 2374}, + {9, 2631}, + {11, 2680}, + {12, 2833}, + {13, 3230}, + {14, 3427}, + {15, 3726}, + {16, 4025}, + {17, 4324}, + {18, 4623}, + {19, 4922}, + {20, 5221}, + {21, 5520}, + {22, 5819}, + {23, 5853}, + {24, 5972}, + {25, 6091}, + {26, 6210}, + {27, 6329}, + {28, 6448}, + {29, 6567}, + {30, 6686}, + {31, 6805}, + {32, 6924}, + {33, 7043}, + {34, 7162}, + {35, 7281}, + {36, 7400}, + {37, 7519}, + {38, 7638}, + {41, 7827}, + {42, 8019}, + {43, 8211}, + {44, 8403}, + {45, 8595}, + {46, 8787}, + {47, 8979}, + {48, 9171}, + {49, 9363}, + {50, 9555}, + {51, 9747}, + {52, 9939}, + {53, 10131}, + {54, 10323}, + {55, 10515}, + {56, 10707}, + {73, 11779}, + {74, 11959}, + {75, 12139}, + {76, 12319}, + {77, 12499}, + {78, 12679}, + {79, 12859}, + {80, 13039}, + {81, 13219}, + {82, 13399}, + {83, 13579}, + {84, 13759}, + {85, 13939}, + {86, 14119}, + {87, 14299}, + {88, 14479}, + {90, 14780}, + {98, 15125}, }; GpaPaddedCounterDesc kGlPaddedCounterByGroupGfx8[] = { @@ -362,7 +362,6 @@ namespace counter_gl_gfx8 const std::set kHwGlTimestampBlockIdsGfx8 = {98}; ///< Timestamp block id's for GL for gfx8 family const std::set kHwGlTimeCounterIndicesGfx8 = {15125, 15126, 15127, 15128, 15129, 15130}; ///< Timestamp counter indices for GL for gfx8 family const unsigned int kHwGlGroupCountGfx8 = static_cast(kHwGlGroupsGfx8.size()); - const unsigned int kHwGlExposedCountersGroupCountGfx8 = 71; const unsigned int kGlPaddedCounterGroupCountGfx8 = 0; const unsigned int kHwGlSqGroupCountGfx8 = sizeof(kHwGlSqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwGlSqIsolatedGroupCountGfx8 = sizeof(kHwGlSqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.h index f43e46d4..0e3560c3 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx8.h @@ -35,7 +35,6 @@ namespace counter_gl_gfx8 extern const std::set kHwGlTimestampBlockIdsGfx8; ///< Timestamp block id's for Gl for Gfx8 family extern const std::set kHwGlTimeCounterIndicesGfx8; ///< Timestamp counter indices for Gl for Gfx8 family extern const unsigned int kHwGlGroupCountGfx8; ///< Hardware Group Count for Gl for Gfx8 family - extern const unsigned int kHwGlExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Gl for Gfx8 family extern const unsigned int kGlPaddedCounterGroupCountGfx8; ///< reserved counter group count for Gl for Gfx8 family extern const unsigned int kHwGlSqGroupCountGfx8; ///< Hardware SQ Group Count for Gl for Gfx8 family extern const unsigned int kHwGlSqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Gl for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.cc index 6b7d9d30..2385c04d 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.cc @@ -194,78 +194,78 @@ namespace counter_gl_gfx9 }; GpaCounterGroupExposedCounterDesc kHwGlExposedCountersByGroupGfx9[] = { - {0, 0, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {1, 444, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {2, 888, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {3, 1332, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {4, 1776, {0, 23}}, - {5, 1808, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {6, 2136, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {7, 2464, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {8, 2792, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {9, 3120, {0, 2}}, - {11, 3174, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {12, 3525, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 4017, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {14, 4213, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {15, 4587, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {16, 4961, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {17, 5335, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {18, 5709, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {19, 6083, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {20, 6457, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {21, 6831, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {22, 7205, {12, 14, 17, 19, 22, 24, 27, 29}}, - {23, 7413, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {24, 7532, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {25, 7651, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {26, 7770, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {27, 7889, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {28, 8008, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {29, 8127, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {30, 8246, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {31, 8365, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {32, 8484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {33, 8603, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {34, 8722, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {35, 8841, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 8960, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 9079, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 9198, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 9387, {20, 22, 29, 30, 33, 41, 42}}, - {42, 9669, {20, 22, 29, 30, 33, 41, 42}}, - {43, 9951, {20, 22, 29, 30, 33, 41, 42}}, - {44, 10233, {20, 22, 29, 30, 33, 41, 42}}, - {45, 10515, {20, 22, 29, 30, 33, 41, 42}}, - {46, 10797, {20, 22, 29, 30, 33, 41, 42}}, - {47, 11079, {20, 22, 29, 30, 33, 41, 42}}, - {48, 11361, {20, 22, 29, 30, 33, 41, 42}}, - {49, 11643, {20, 22, 29, 30, 33, 41, 42}}, - {50, 11925, {20, 22, 29, 30, 33, 41, 42}}, - {51, 12207, {20, 22, 29, 30, 33, 41, 42}}, - {52, 12489, {20, 22, 29, 30, 33, 41, 42}}, - {53, 12771, {20, 22, 29, 30, 33, 41, 42}}, - {54, 13053, {20, 22, 29, 30, 33, 41, 42}}, - {55, 13335, {20, 22, 29, 30, 33, 41, 42}}, - {56, 13617, {20, 22, 29, 30, 33, 41, 42}}, - {73, 14811, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {74, 14896, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {75, 14981, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {76, 15066, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {77, 15151, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {78, 15236, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {79, 15321, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {80, 15406, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {81, 15491, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {82, 15576, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {83, 15661, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {84, 15746, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {85, 15831, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {86, 15916, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {87, 16001, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {88, 16086, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {90, 16292, {1, 9, 105, 114, 125, 146}}, - {96, 16630, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 444}, + {2, 888}, + {3, 1332}, + {4, 1776}, + {5, 1808}, + {6, 2136}, + {7, 2464}, + {8, 2792}, + {9, 3120}, + {11, 3174}, + {12, 3525}, + {13, 4017}, + {14, 4213}, + {15, 4587}, + {16, 4961}, + {17, 5335}, + {18, 5709}, + {19, 6083}, + {20, 6457}, + {21, 6831}, + {22, 7205}, + {23, 7413}, + {24, 7532}, + {25, 7651}, + {26, 7770}, + {27, 7889}, + {28, 8008}, + {29, 8127}, + {30, 8246}, + {31, 8365}, + {32, 8484}, + {33, 8603}, + {34, 8722}, + {35, 8841}, + {36, 8960}, + {37, 9079}, + {38, 9198}, + {41, 9387}, + {42, 9669}, + {43, 9951}, + {44, 10233}, + {45, 10515}, + {46, 10797}, + {47, 11079}, + {48, 11361}, + {49, 11643}, + {50, 11925}, + {51, 12207}, + {52, 12489}, + {53, 12771}, + {54, 13053}, + {55, 13335}, + {56, 13617}, + {73, 14811}, + {74, 14896}, + {75, 14981}, + {76, 15066}, + {77, 15151}, + {78, 15236}, + {79, 15321}, + {80, 15406}, + {81, 15491}, + {82, 15576}, + {83, 15661}, + {84, 15746}, + {85, 15831}, + {86, 15916}, + {87, 16001}, + {88, 16086}, + {90, 16292}, + {96, 16630}, }; GpaPaddedCounterDesc kGlPaddedCounterByGroupGfx9[] = { @@ -383,7 +383,6 @@ namespace counter_gl_gfx9 const std::set kHwGlTimestampBlockIdsGfx9 = {96}; ///< Timestamp block id's for GL for gfx9 family const std::set kHwGlTimeCounterIndicesGfx9 = {16630, 16631, 16632, 16633, 16634, 16635}; ///< Timestamp counter indices for GL for gfx9 family const unsigned int kHwGlGroupCountGfx9 = static_cast(kHwGlGroupsGfx9.size()); - const unsigned int kHwGlExposedCountersGroupCountGfx9 = 72; const unsigned int kGlPaddedCounterGroupCountGfx9 = 22; const unsigned int kHwGlSqGroupCountGfx9 = sizeof(kHwGlSqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwGlSqIsolatedGroupCountGfx9 = sizeof(kHwGlSqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.h index 16fe09ec..89a11f33 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_gl_gfx9.h @@ -35,7 +35,6 @@ namespace counter_gl_gfx9 extern const std::set kHwGlTimestampBlockIdsGfx9; ///< Timestamp block id's for Gl for Gfx9 family extern const std::set kHwGlTimeCounterIndicesGfx9; ///< Timestamp counter indices for Gl for Gfx9 family extern const unsigned int kHwGlGroupCountGfx9; ///< Hardware Group Count for Gl for Gfx9 family - extern const unsigned int kHwGlExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Gl for Gfx9 family extern const unsigned int kGlPaddedCounterGroupCountGfx9; ///< reserved counter group count for Gl for Gfx9 family extern const unsigned int kHwGlSqGroupCountGfx9; ///< Hardware SQ Group Count for Gl for Gfx9 family extern const unsigned int kHwGlSqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Gl for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.cc index 0157dab4..1e84c0b9 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.cc @@ -567,212 +567,212 @@ namespace counter_oglp_gfx10 }; GpaCounterGroupExposedCounterDesc kHwOglpExposedCountersByGroupGfx10[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 306, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 572, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 838, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1104, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1656, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2208, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2760, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3312, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 3864, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4416, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 4968, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5520, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {14, 5849, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 6178, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 6690, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 7202, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 7714, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 8226, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 8738, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 9250, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 9762, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 10274, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {24, 10786, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {25, 11298, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 11810, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12322, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 12834, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13346, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 13858, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14370, {12, 14, 17, 19, 22, 24, 27, 29}}, - {32, 14595, {12, 14, 17, 19, 22, 24, 27, 29}}, - {33, 14820, {12, 14, 17, 19, 22, 24, 27, 29}}, - {34, 15045, {12, 14, 17, 19, 22, 24, 27, 29}}, - {35, 15270, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 15496, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 15722, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 15948, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {39, 16174, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {40, 16400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 16626, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {42, 16852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {43, 17078, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {44, 17304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {45, 17530, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {46, 17756, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {47, 17982, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {48, 18208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {49, 18434, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {50, 18660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {51, 18886, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {52, 19112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {53, 19338, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {54, 19564, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {55, 19790, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 20016, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 20242, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 20468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 20694, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 20920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 21146, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 21372, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 21598, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 21824, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 22050, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 22276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 22502, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 22728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 22954, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 23180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 23406, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 23632, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 23858, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 24084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 26750, {9, 18, 36, 44, 45, 46}}, - {116, 26827, {9, 18, 36, 44, 45, 46}}, - {117, 26904, {9, 18, 36, 44, 45, 46}}, - {118, 26981, {9, 18, 36, 44, 45, 46}}, - {119, 27058, {9, 18, 36, 44, 45, 46}}, - {120, 27135, {9, 18, 36, 44, 45, 46}}, - {121, 27212, {9, 18, 36, 44, 45, 46}}, - {122, 27289, {9, 18, 36, 44, 45, 46}}, - {123, 27366, {9, 18, 36, 44, 45, 46}}, - {124, 27443, {9, 18, 36, 44, 45, 46}}, - {125, 27520, {9, 18, 36, 44, 45, 46}}, - {126, 27597, {9, 18, 36, 44, 45, 46}}, - {127, 27674, {9, 18, 36, 44, 45, 46}}, - {128, 27751, {9, 18, 36, 44, 45, 46}}, - {129, 27828, {9, 18, 36, 44, 45, 46}}, - {130, 27905, {9, 18, 36, 44, 45, 46}}, - {131, 27982, {9, 18, 36, 44, 45, 46}}, - {132, 28059, {9, 18, 36, 44, 45, 46}}, - {133, 28136, {9, 18, 36, 44, 45, 46}}, - {134, 28213, {9, 18, 36, 44, 45, 46}}, - {135, 28290, {9, 18, 36, 44, 45, 46}}, - {136, 28367, {9, 18, 36, 44, 45, 46}}, - {137, 28444, {9, 18, 36, 44, 45, 46}}, - {138, 28521, {9, 18, 36, 44, 45, 46}}, - {139, 28598, {9, 18, 36, 44, 45, 46}}, - {140, 28675, {9, 18, 36, 44, 45, 46}}, - {141, 28752, {9, 18, 36, 44, 45, 46}}, - {142, 28829, {9, 18, 36, 44, 45, 46}}, - {143, 28906, {9, 18, 36, 44, 45, 46}}, - {144, 28983, {9, 18, 36, 44, 45, 46}}, - {145, 29060, {9, 18, 36, 44, 45, 46}}, - {146, 29137, {9, 18, 36, 44, 45, 46}}, - {147, 29214, {9, 18, 36, 44, 45, 46}}, - {148, 29291, {9, 18, 36, 44, 45, 46}}, - {149, 29368, {9, 18, 36, 44, 45, 46}}, - {150, 29445, {9, 18, 36, 44, 45, 46}}, - {151, 29522, {9, 18, 36, 44, 45, 46}}, - {152, 29599, {9, 18, 36, 44, 45, 46}}, - {153, 29676, {9, 18, 36, 44, 45, 46}}, - {154, 29753, {9, 18, 36, 44, 45, 46}}, - {155, 29830, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {156, 30200, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {157, 30570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {158, 30940, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {159, 31310, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {160, 31680, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {161, 32050, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {162, 32420, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {163, 32790, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {164, 33160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {165, 33530, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {166, 33900, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {167, 34270, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {168, 34640, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {169, 35010, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {170, 35380, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {171, 35750, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {172, 36211, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {173, 36672, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {174, 37133, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {175, 37594, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {176, 38055, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {177, 38516, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {178, 38977, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {179, 39438, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {180, 39899, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {181, 40360, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {182, 40821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {183, 41282, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {184, 41743, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {185, 42204, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {186, 42665, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {188, 43249, {0, 2}}, - {199, 43729, {55, 57}}, - {200, 43818, {55, 57}}, - {201, 43907, {55, 57}}, - {202, 43996, {55, 57}}, - {203, 44085, {55, 57}}, - {204, 44174, {55, 57}}, - {205, 44263, {55, 57}}, - {206, 44352, {55, 57}}, - {207, 44441, {55, 57}}, - {208, 44530, {55, 57}}, - {209, 44619, {55, 57}}, - {210, 44708, {55, 57}}, - {211, 44797, {55, 57}}, - {212, 44886, {55, 57}}, - {213, 44975, {55, 57}}, - {214, 45064, {55, 57}}, - {252, 50144, {211, 221, 227, 247, 275}}, - {261, 50747, {14, 18}}, - {262, 50811, {14, 18}}, - {263, 50875, {14, 18}}, - {264, 50939, {14, 18}}, - {265, 51003, {14, 18}}, - {266, 51067, {14, 18}}, - {267, 51131, {14, 18}}, - {268, 51195, {14, 18}}, - {269, 51259, {14, 18}}, - {270, 51323, {14, 18}}, - {271, 51387, {14, 18}}, - {272, 51451, {14, 18}}, - {273, 51515, {14, 18}}, - {274, 51579, {14, 18}}, - {275, 51643, {14, 18}}, - {276, 51707, {14, 18}}, - {297, 52743, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {298, 52978, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {299, 53213, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {300, 53448, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {301, 53683, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {302, 53918, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {303, 54153, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {304, 54388, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {305, 54623, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {306, 54858, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {307, 55093, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {308, 55328, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {309, 55563, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {310, 55798, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {311, 56033, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {312, 56268, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {313, 56503, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {314, 56738, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {315, 56973, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {316, 57208, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {317, 57443, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {318, 57678, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {319, 57913, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {320, 58148, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {335, 59898, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 306}, + {3, 572}, + {4, 838}, + {5, 1104}, + {6, 1656}, + {7, 2208}, + {8, 2760}, + {9, 3312}, + {10, 3864}, + {11, 4416}, + {12, 4968}, + {13, 5520}, + {14, 5849}, + {15, 6178}, + {16, 6690}, + {17, 7202}, + {18, 7714}, + {19, 8226}, + {20, 8738}, + {21, 9250}, + {22, 9762}, + {23, 10274}, + {24, 10786}, + {25, 11298}, + {26, 11810}, + {27, 12322}, + {28, 12834}, + {29, 13346}, + {30, 13858}, + {31, 14370}, + {32, 14595}, + {33, 14820}, + {34, 15045}, + {35, 15270}, + {36, 15496}, + {37, 15722}, + {38, 15948}, + {39, 16174}, + {40, 16400}, + {41, 16626}, + {42, 16852}, + {43, 17078}, + {44, 17304}, + {45, 17530}, + {46, 17756}, + {47, 17982}, + {48, 18208}, + {49, 18434}, + {50, 18660}, + {51, 18886}, + {52, 19112}, + {53, 19338}, + {54, 19564}, + {55, 19790}, + {56, 20016}, + {57, 20242}, + {58, 20468}, + {59, 20694}, + {60, 20920}, + {61, 21146}, + {62, 21372}, + {63, 21598}, + {64, 21824}, + {65, 22050}, + {66, 22276}, + {67, 22502}, + {68, 22728}, + {69, 22954}, + {70, 23180}, + {71, 23406}, + {72, 23632}, + {73, 23858}, + {74, 24084}, + {115, 26750}, + {116, 26827}, + {117, 26904}, + {118, 26981}, + {119, 27058}, + {120, 27135}, + {121, 27212}, + {122, 27289}, + {123, 27366}, + {124, 27443}, + {125, 27520}, + {126, 27597}, + {127, 27674}, + {128, 27751}, + {129, 27828}, + {130, 27905}, + {131, 27982}, + {132, 28059}, + {133, 28136}, + {134, 28213}, + {135, 28290}, + {136, 28367}, + {137, 28444}, + {138, 28521}, + {139, 28598}, + {140, 28675}, + {141, 28752}, + {142, 28829}, + {143, 28906}, + {144, 28983}, + {145, 29060}, + {146, 29137}, + {147, 29214}, + {148, 29291}, + {149, 29368}, + {150, 29445}, + {151, 29522}, + {152, 29599}, + {153, 29676}, + {154, 29753}, + {155, 29830}, + {156, 30200}, + {157, 30570}, + {158, 30940}, + {159, 31310}, + {160, 31680}, + {161, 32050}, + {162, 32420}, + {163, 32790}, + {164, 33160}, + {165, 33530}, + {166, 33900}, + {167, 34270}, + {168, 34640}, + {169, 35010}, + {170, 35380}, + {171, 35750}, + {172, 36211}, + {173, 36672}, + {174, 37133}, + {175, 37594}, + {176, 38055}, + {177, 38516}, + {178, 38977}, + {179, 39438}, + {180, 39899}, + {181, 40360}, + {182, 40821}, + {183, 41282}, + {184, 41743}, + {185, 42204}, + {186, 42665}, + {188, 43249}, + {199, 43729}, + {200, 43818}, + {201, 43907}, + {202, 43996}, + {203, 44085}, + {204, 44174}, + {205, 44263}, + {206, 44352}, + {207, 44441}, + {208, 44530}, + {209, 44619}, + {210, 44708}, + {211, 44797}, + {212, 44886}, + {213, 44975}, + {214, 45064}, + {252, 50144}, + {261, 50747}, + {262, 50811}, + {263, 50875}, + {264, 50939}, + {265, 51003}, + {266, 51067}, + {267, 51131}, + {268, 51195}, + {269, 51259}, + {270, 51323}, + {271, 51387}, + {272, 51451}, + {273, 51515}, + {274, 51579}, + {275, 51643}, + {276, 51707}, + {297, 52743}, + {298, 52978}, + {299, 53213}, + {300, 53448}, + {301, 53683}, + {302, 53918}, + {303, 54153}, + {304, 54388}, + {305, 54623}, + {306, 54858}, + {307, 55093}, + {308, 55328}, + {309, 55563}, + {310, 55798}, + {311, 56033}, + {312, 56268}, + {313, 56503}, + {314, 56738}, + {315, 56973}, + {316, 57208}, + {317, 57443}, + {318, 57678}, + {319, 57913}, + {320, 58148}, + {335, 59898}, }; GpaPaddedCounterDesc kOglpPaddedCounterByGroupGfx10[] = { @@ -931,7 +931,6 @@ namespace counter_oglp_gfx10 const std::set kHwOglpTimestampBlockIdsGfx10 = {335}; ///< Timestamp block id's for OGLP for gfx10 family const std::set kHwOglpTimeCounterIndicesGfx10 = {59898, 59899, 59900, 59901, 59902, 59903}; ///< Timestamp counter indices for OGLP for gfx10 family const unsigned int kHwOglpGroupCountGfx10 = static_cast(kHwOglpGroupsGfx10.size()); - const unsigned int kHwOglpExposedCountersGroupCountGfx10 = 206; const unsigned int kOglpPaddedCounterGroupCountGfx10 = 0; const unsigned int kHwOglpSqGroupCountGfx10 = sizeof(kHwOglpSqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwOglpSqIsolatedGroupCountGfx10 = sizeof(kHwOglpSqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.h index 9b616460..1bae3c70 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx10.h @@ -35,7 +35,6 @@ namespace counter_oglp_gfx10 extern const std::set kHwOglpTimestampBlockIdsGfx10; ///< Timestamp block id's for Oglp for Gfx10 family extern const std::set kHwOglpTimeCounterIndicesGfx10; ///< Timestamp counter indices for Oglp for Gfx10 family extern const unsigned int kHwOglpGroupCountGfx10; ///< Hardware Group Count for Oglp for Gfx10 family - extern const unsigned int kHwOglpExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Oglp for Gfx10 family extern const unsigned int kOglpPaddedCounterGroupCountGfx10; ///< reserved counter group count for Oglp for Gfx10 family extern const unsigned int kHwOglpSqGroupCountGfx10; ///< Hardware SQ Group Count for Oglp for Gfx10 family extern const unsigned int kHwOglpSqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Oglp for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.cc index c694de19..0ec68f53 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.cc @@ -970,414 +970,414 @@ namespace counter_oglp_gfx103 }; GpaCounterGroupExposedCounterDesc kHwOglpExposedCountersByGroupGfx103[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 316, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 592, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 868, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1144, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1722, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2300, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2878, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3456, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 4034, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4612, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 5190, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5768, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 6346, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 6924, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {16, 7502, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {17, 8080, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {18, 8658, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {19, 9236, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {20, 9814, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {21, 10392, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {22, 10724, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {23, 11056, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {24, 11388, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {25, 11720, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 12232, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12744, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 13256, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13768, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 14280, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14792, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {32, 15304, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {33, 15816, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {34, 16328, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {35, 16840, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {36, 17352, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {37, 17864, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {38, 18376, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {39, 18888, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {40, 19400, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {41, 19912, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {42, 20424, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {43, 20936, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {44, 21448, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {45, 21960, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {46, 22472, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {47, 22984, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {48, 23496, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {49, 24008, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {50, 24520, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {51, 25032, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {52, 25544, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {53, 26056, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {54, 26568, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {55, 27080, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {56, 27592, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {57, 28104, {12, 14, 17, 19, 22, 24, 27, 29}}, - {58, 28329, {12, 14, 17, 19, 22, 24, 27, 29}}, - {59, 28554, {12, 14, 17, 19, 22, 24, 27, 29}}, - {60, 28779, {12, 14, 17, 19, 22, 24, 27, 29}}, - {61, 29004, {12, 14, 17, 19, 22, 24, 27, 29}}, - {62, 29229, {12, 14, 17, 19, 22, 24, 27, 29}}, - {63, 29454, {12, 14, 17, 19, 22, 24, 27, 29}}, - {64, 29679, {12, 14, 17, 19, 22, 24, 27, 29}}, - {65, 29904, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {66, 30140, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {67, 30376, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {68, 30612, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {69, 30848, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {70, 31084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {71, 31320, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {72, 31556, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {73, 31792, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {74, 32028, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {75, 32264, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {76, 32500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {77, 32736, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {78, 32972, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {79, 33208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 33444, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 33680, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 33916, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 34152, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 34388, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 34624, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 34860, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 35096, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 35332, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 35568, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 35804, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 36040, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 36276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 36512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 36748, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 36984, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 37220, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 37456, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 37692, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 37928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 38164, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 38400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 38636, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 38872, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 39108, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 39344, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 39580, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 39816, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 40052, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 40288, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 40524, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 40760, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 40996, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 41232, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 41468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 41704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 41940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 42176, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 42412, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 42648, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 42884, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 43120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 43356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 43592, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 43828, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 44064, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 44300, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 44536, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 44772, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 45008, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 45244, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 45480, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 45716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 45952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 46188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 46424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 46660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 46896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 47132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 47368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 47604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 47840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 48076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 48312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 48548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 48784, {82, 116, 117, 118}}, - {146, 48976, {82, 116, 117, 118}}, - {147, 49168, {82, 116, 117, 118}}, - {148, 49360, {82, 116, 117, 118}}, - {149, 49552, {82, 116, 117, 118}}, - {150, 49744, {82, 116, 117, 118}}, - {151, 49936, {82, 116, 117, 118}}, - {152, 50128, {82, 116, 117, 118}}, - {153, 50320, {82, 116, 117, 118}}, - {154, 50512, {82, 116, 117, 118}}, - {155, 50704, {82, 116, 117, 118}}, - {156, 50896, {82, 116, 117, 118}}, - {157, 51088, {82, 116, 117, 118}}, - {158, 51280, {82, 116, 117, 118}}, - {159, 51472, {82, 116, 117, 118}}, - {160, 51664, {82, 116, 117, 118}}, - {161, 51856, {82, 116, 117, 118}}, - {162, 52048, {82, 116, 117, 118}}, - {163, 52240, {82, 116, 117, 118}}, - {164, 52432, {82, 116, 117, 118}}, - {165, 52624, {82, 116, 117, 118}}, - {166, 52816, {82, 116, 117, 118}}, - {167, 53008, {82, 116, 117, 118}}, - {168, 53200, {82, 116, 117, 118}}, - {169, 53392, {82, 116, 117, 118}}, - {170, 53584, {82, 116, 117, 118}}, - {171, 53776, {82, 116, 117, 118}}, - {172, 53968, {82, 116, 117, 118}}, - {173, 54160, {82, 116, 117, 118}}, - {174, 54352, {82, 116, 117, 118}}, - {175, 54544, {82, 116, 117, 118}}, - {176, 54736, {82, 116, 117, 118}}, - {177, 54928, {82, 116, 117, 118}}, - {178, 55120, {82, 116, 117, 118}}, - {179, 55312, {82, 116, 117, 118}}, - {180, 55504, {82, 116, 117, 118}}, - {181, 55696, {82, 116, 117, 118}}, - {182, 55888, {82, 116, 117, 118}}, - {183, 56080, {82, 116, 117, 118}}, - {184, 56272, {82, 116, 117, 118}}, - {185, 56464, {82, 116, 117, 118}}, - {186, 56656, {82, 116, 117, 118}}, - {187, 56848, {82, 116, 117, 118}}, - {188, 57040, {82, 116, 117, 118}}, - {189, 57232, {82, 116, 117, 118}}, - {190, 57424, {82, 116, 117, 118}}, - {191, 57616, {82, 116, 117, 118}}, - {192, 57808, {82, 116, 117, 118}}, - {193, 58000, {82, 116, 117, 118}}, - {194, 58192, {82, 116, 117, 118}}, - {195, 58384, {82, 116, 117, 118}}, - {196, 58576, {82, 116, 117, 118}}, - {197, 58768, {82, 116, 117, 118}}, - {198, 58960, {82, 116, 117, 118}}, - {199, 59152, {82, 116, 117, 118}}, - {200, 59344, {82, 116, 117, 118}}, - {201, 59536, {82, 116, 117, 118}}, - {202, 59728, {82, 116, 117, 118}}, - {203, 59920, {82, 116, 117, 118}}, - {204, 60112, {82, 116, 117, 118}}, - {205, 60304, {82, 116, 117, 118}}, - {206, 60496, {82, 116, 117, 118}}, - {207, 60688, {82, 116, 117, 118}}, - {208, 60880, {82, 116, 117, 118}}, - {209, 61072, {82, 116, 117, 118}}, - {210, 61264, {82, 116, 117, 118}}, - {211, 61456, {82, 116, 117, 118}}, - {212, 61648, {82, 116, 117, 118}}, - {213, 61840, {82, 116, 117, 118}}, - {214, 62032, {82, 116, 117, 118}}, - {215, 62224, {82, 116, 117, 118}}, - {216, 62416, {82, 116, 117, 118}}, - {217, 62608, {82, 116, 117, 118}}, - {218, 62800, {82, 116, 117, 118}}, - {219, 62992, {82, 116, 117, 118}}, - {220, 63184, {82, 116, 117, 118}}, - {221, 63376, {82, 116, 117, 118}}, - {222, 63568, {82, 116, 117, 118}}, - {223, 63760, {82, 116, 117, 118}}, - {224, 63952, {82, 116, 117, 118}}, - {225, 64144, {9, 18, 36, 43, 44, 45}}, - {226, 64205, {9, 18, 36, 43, 44, 45}}, - {227, 64266, {9, 18, 36, 43, 44, 45}}, - {228, 64327, {9, 18, 36, 43, 44, 45}}, - {229, 64388, {9, 18, 36, 43, 44, 45}}, - {230, 64449, {9, 18, 36, 43, 44, 45}}, - {231, 64510, {9, 18, 36, 43, 44, 45}}, - {232, 64571, {9, 18, 36, 43, 44, 45}}, - {233, 64632, {9, 18, 36, 43, 44, 45}}, - {234, 64693, {9, 18, 36, 43, 44, 45}}, - {235, 64754, {9, 18, 36, 43, 44, 45}}, - {236, 64815, {9, 18, 36, 43, 44, 45}}, - {237, 64876, {9, 18, 36, 43, 44, 45}}, - {238, 64937, {9, 18, 36, 43, 44, 45}}, - {239, 64998, {9, 18, 36, 43, 44, 45}}, - {240, 65059, {9, 18, 36, 43, 44, 45}}, - {241, 65120, {9, 18, 36, 43, 44, 45}}, - {242, 65181, {9, 18, 36, 43, 44, 45}}, - {243, 65242, {9, 18, 36, 43, 44, 45}}, - {244, 65303, {9, 18, 36, 43, 44, 45}}, - {245, 65364, {9, 18, 36, 43, 44, 45}}, - {246, 65425, {9, 18, 36, 43, 44, 45}}, - {247, 65486, {9, 18, 36, 43, 44, 45}}, - {248, 65547, {9, 18, 36, 43, 44, 45}}, - {249, 65608, {9, 18, 36, 43, 44, 45}}, - {250, 65669, {9, 18, 36, 43, 44, 45}}, - {251, 65730, {9, 18, 36, 43, 44, 45}}, - {252, 65791, {9, 18, 36, 43, 44, 45}}, - {253, 65852, {9, 18, 36, 43, 44, 45}}, - {254, 65913, {9, 18, 36, 43, 44, 45}}, - {255, 65974, {9, 18, 36, 43, 44, 45}}, - {256, 66035, {9, 18, 36, 43, 44, 45}}, - {257, 66096, {9, 18, 36, 43, 44, 45}}, - {258, 66157, {9, 18, 36, 43, 44, 45}}, - {259, 66218, {9, 18, 36, 43, 44, 45}}, - {260, 66279, {9, 18, 36, 43, 44, 45}}, - {261, 66340, {9, 18, 36, 43, 44, 45}}, - {262, 66401, {9, 18, 36, 43, 44, 45}}, - {263, 66462, {9, 18, 36, 43, 44, 45}}, - {264, 66523, {9, 18, 36, 43, 44, 45}}, - {265, 66584, {9, 18, 36, 43, 44, 45}}, - {266, 66645, {9, 18, 36, 43, 44, 45}}, - {267, 66706, {9, 18, 36, 43, 44, 45}}, - {268, 66767, {9, 18, 36, 43, 44, 45}}, - {269, 66828, {9, 18, 36, 43, 44, 45}}, - {270, 66889, {9, 18, 36, 43, 44, 45}}, - {271, 66950, {9, 18, 36, 43, 44, 45}}, - {272, 67011, {9, 18, 36, 43, 44, 45}}, - {273, 67072, {9, 18, 36, 43, 44, 45}}, - {274, 67133, {9, 18, 36, 43, 44, 45}}, - {275, 67194, {9, 18, 36, 43, 44, 45}}, - {276, 67255, {9, 18, 36, 43, 44, 45}}, - {277, 67316, {9, 18, 36, 43, 44, 45}}, - {278, 67377, {9, 18, 36, 43, 44, 45}}, - {279, 67438, {9, 18, 36, 43, 44, 45}}, - {280, 67499, {9, 18, 36, 43, 44, 45}}, - {281, 67560, {9, 18, 36, 43, 44, 45}}, - {282, 67621, {9, 18, 36, 43, 44, 45}}, - {283, 67682, {9, 18, 36, 43, 44, 45}}, - {284, 67743, {9, 18, 36, 43, 44, 45}}, - {285, 67804, {9, 18, 36, 43, 44, 45}}, - {286, 67865, {9, 18, 36, 43, 44, 45}}, - {287, 67926, {9, 18, 36, 43, 44, 45}}, - {288, 67987, {9, 18, 36, 43, 44, 45}}, - {289, 68048, {9, 18, 36, 43, 44, 45}}, - {290, 68109, {9, 18, 36, 43, 44, 45}}, - {291, 68170, {9, 18, 36, 43, 44, 45}}, - {292, 68231, {9, 18, 36, 43, 44, 45}}, - {293, 68292, {9, 18, 36, 43, 44, 45}}, - {294, 68353, {9, 18, 36, 43, 44, 45}}, - {295, 68414, {9, 18, 36, 43, 44, 45}}, - {296, 68475, {9, 18, 36, 43, 44, 45}}, - {297, 68536, {9, 18, 36, 43, 44, 45}}, - {298, 68597, {9, 18, 36, 43, 44, 45}}, - {299, 68658, {9, 18, 36, 43, 44, 45}}, - {300, 68719, {9, 18, 36, 43, 44, 45}}, - {301, 68780, {9, 18, 36, 43, 44, 45}}, - {302, 68841, {9, 18, 36, 43, 44, 45}}, - {303, 68902, {9, 18, 36, 43, 44, 45}}, - {304, 68963, {9, 18, 36, 43, 44, 45}}, - {305, 69024, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {306, 69415, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {307, 69806, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {308, 70197, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {309, 70588, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {310, 70979, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {311, 71370, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {312, 71761, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {313, 72152, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {314, 72543, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {315, 72934, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {316, 73325, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {317, 73716, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {318, 74107, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {319, 74498, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {320, 74889, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {321, 75280, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {322, 75733, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {323, 76186, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {324, 76639, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {325, 77092, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {326, 77545, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {327, 77998, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {328, 78451, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {329, 78904, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {330, 79357, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {331, 79810, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {332, 80263, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {333, 80716, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {334, 81169, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {335, 81622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {336, 82075, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {338, 82649, {0, 2}}, - {351, 83291, {55, 57}}, - {352, 83381, {55, 57}}, - {353, 83471, {55, 57}}, - {354, 83561, {55, 57}}, - {355, 83651, {55, 57}}, - {356, 83741, {55, 57}}, - {357, 83831, {55, 57}}, - {358, 83921, {55, 57}}, - {359, 84011, {55, 57}}, - {360, 84101, {55, 57}}, - {361, 84191, {55, 57}}, - {362, 84281, {55, 57}}, - {363, 84371, {55, 57}}, - {364, 84461, {55, 57}}, - {365, 84551, {55, 57}}, - {366, 84641, {55, 57}}, - {429, 94083, {14, 18}}, - {430, 94166, {14, 18}}, - {431, 94249, {14, 18}}, - {432, 94332, {14, 18}}, - {433, 94415, {14, 18}}, - {434, 94498, {14, 18}}, - {435, 94581, {14, 18}}, - {436, 94664, {14, 18}}, - {437, 94747, {14, 18}}, - {438, 94830, {14, 18}}, - {439, 94913, {14, 18}}, - {440, 94996, {14, 18}}, - {441, 95079, {14, 18}}, - {442, 95162, {14, 18}}, - {443, 95245, {14, 18}}, - {444, 95328, {14, 18}}, - {445, 95411, {14, 18}}, - {446, 95494, {14, 18}}, - {447, 95577, {14, 18}}, - {448, 95660, {14, 18}}, - {449, 95743, {14, 18}}, - {450, 95826, {14, 18}}, - {451, 95909, {14, 18}}, - {452, 95992, {14, 18}}, - {453, 96075, {14, 18}}, - {454, 96158, {14, 18}}, - {455, 96241, {14, 18}}, - {456, 96324, {14, 18}}, - {457, 96407, {14, 18}}, - {458, 96490, {14, 18}}, - {459, 96573, {14, 18}}, - {460, 96656, {14, 18}}, - {497, 98319, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {498, 98573, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {499, 98827, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {500, 99081, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {501, 99335, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {502, 99589, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {503, 99843, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {504, 100097, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {505, 100351, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {506, 100605, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {507, 100859, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {508, 101113, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {509, 101367, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {510, 101621, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {511, 101875, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {512, 102129, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {530, 104101, {42}}, - {531, 104164, {4, 73, 80, 86, 111}}, - {532, 104303, {4, 73, 80, 86, 111}}, - {533, 104442, {4, 73, 80, 86, 111}}, - {534, 104581, {4, 73, 80, 86, 111}}, - {536, 104725, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 316}, + {3, 592}, + {4, 868}, + {5, 1144}, + {6, 1722}, + {7, 2300}, + {8, 2878}, + {9, 3456}, + {10, 4034}, + {11, 4612}, + {12, 5190}, + {13, 5768}, + {14, 6346}, + {15, 6924}, + {16, 7502}, + {17, 8080}, + {18, 8658}, + {19, 9236}, + {20, 9814}, + {21, 10392}, + {22, 10724}, + {23, 11056}, + {24, 11388}, + {25, 11720}, + {26, 12232}, + {27, 12744}, + {28, 13256}, + {29, 13768}, + {30, 14280}, + {31, 14792}, + {32, 15304}, + {33, 15816}, + {34, 16328}, + {35, 16840}, + {36, 17352}, + {37, 17864}, + {38, 18376}, + {39, 18888}, + {40, 19400}, + {41, 19912}, + {42, 20424}, + {43, 20936}, + {44, 21448}, + {45, 21960}, + {46, 22472}, + {47, 22984}, + {48, 23496}, + {49, 24008}, + {50, 24520}, + {51, 25032}, + {52, 25544}, + {53, 26056}, + {54, 26568}, + {55, 27080}, + {56, 27592}, + {57, 28104}, + {58, 28329}, + {59, 28554}, + {60, 28779}, + {61, 29004}, + {62, 29229}, + {63, 29454}, + {64, 29679}, + {65, 29904}, + {66, 30140}, + {67, 30376}, + {68, 30612}, + {69, 30848}, + {70, 31084}, + {71, 31320}, + {72, 31556}, + {73, 31792}, + {74, 32028}, + {75, 32264}, + {76, 32500}, + {77, 32736}, + {78, 32972}, + {79, 33208}, + {80, 33444}, + {81, 33680}, + {82, 33916}, + {83, 34152}, + {84, 34388}, + {85, 34624}, + {86, 34860}, + {87, 35096}, + {88, 35332}, + {89, 35568}, + {90, 35804}, + {91, 36040}, + {92, 36276}, + {93, 36512}, + {94, 36748}, + {95, 36984}, + {96, 37220}, + {97, 37456}, + {98, 37692}, + {99, 37928}, + {100, 38164}, + {101, 38400}, + {102, 38636}, + {103, 38872}, + {104, 39108}, + {105, 39344}, + {106, 39580}, + {107, 39816}, + {108, 40052}, + {109, 40288}, + {110, 40524}, + {111, 40760}, + {112, 40996}, + {113, 41232}, + {114, 41468}, + {115, 41704}, + {116, 41940}, + {117, 42176}, + {118, 42412}, + {119, 42648}, + {120, 42884}, + {121, 43120}, + {122, 43356}, + {123, 43592}, + {124, 43828}, + {125, 44064}, + {126, 44300}, + {127, 44536}, + {128, 44772}, + {129, 45008}, + {130, 45244}, + {131, 45480}, + {132, 45716}, + {133, 45952}, + {134, 46188}, + {135, 46424}, + {136, 46660}, + {137, 46896}, + {138, 47132}, + {139, 47368}, + {140, 47604}, + {141, 47840}, + {142, 48076}, + {143, 48312}, + {144, 48548}, + {145, 48784}, + {146, 48976}, + {147, 49168}, + {148, 49360}, + {149, 49552}, + {150, 49744}, + {151, 49936}, + {152, 50128}, + {153, 50320}, + {154, 50512}, + {155, 50704}, + {156, 50896}, + {157, 51088}, + {158, 51280}, + {159, 51472}, + {160, 51664}, + {161, 51856}, + {162, 52048}, + {163, 52240}, + {164, 52432}, + {165, 52624}, + {166, 52816}, + {167, 53008}, + {168, 53200}, + {169, 53392}, + {170, 53584}, + {171, 53776}, + {172, 53968}, + {173, 54160}, + {174, 54352}, + {175, 54544}, + {176, 54736}, + {177, 54928}, + {178, 55120}, + {179, 55312}, + {180, 55504}, + {181, 55696}, + {182, 55888}, + {183, 56080}, + {184, 56272}, + {185, 56464}, + {186, 56656}, + {187, 56848}, + {188, 57040}, + {189, 57232}, + {190, 57424}, + {191, 57616}, + {192, 57808}, + {193, 58000}, + {194, 58192}, + {195, 58384}, + {196, 58576}, + {197, 58768}, + {198, 58960}, + {199, 59152}, + {200, 59344}, + {201, 59536}, + {202, 59728}, + {203, 59920}, + {204, 60112}, + {205, 60304}, + {206, 60496}, + {207, 60688}, + {208, 60880}, + {209, 61072}, + {210, 61264}, + {211, 61456}, + {212, 61648}, + {213, 61840}, + {214, 62032}, + {215, 62224}, + {216, 62416}, + {217, 62608}, + {218, 62800}, + {219, 62992}, + {220, 63184}, + {221, 63376}, + {222, 63568}, + {223, 63760}, + {224, 63952}, + {225, 64144}, + {226, 64205}, + {227, 64266}, + {228, 64327}, + {229, 64388}, + {230, 64449}, + {231, 64510}, + {232, 64571}, + {233, 64632}, + {234, 64693}, + {235, 64754}, + {236, 64815}, + {237, 64876}, + {238, 64937}, + {239, 64998}, + {240, 65059}, + {241, 65120}, + {242, 65181}, + {243, 65242}, + {244, 65303}, + {245, 65364}, + {246, 65425}, + {247, 65486}, + {248, 65547}, + {249, 65608}, + {250, 65669}, + {251, 65730}, + {252, 65791}, + {253, 65852}, + {254, 65913}, + {255, 65974}, + {256, 66035}, + {257, 66096}, + {258, 66157}, + {259, 66218}, + {260, 66279}, + {261, 66340}, + {262, 66401}, + {263, 66462}, + {264, 66523}, + {265, 66584}, + {266, 66645}, + {267, 66706}, + {268, 66767}, + {269, 66828}, + {270, 66889}, + {271, 66950}, + {272, 67011}, + {273, 67072}, + {274, 67133}, + {275, 67194}, + {276, 67255}, + {277, 67316}, + {278, 67377}, + {279, 67438}, + {280, 67499}, + {281, 67560}, + {282, 67621}, + {283, 67682}, + {284, 67743}, + {285, 67804}, + {286, 67865}, + {287, 67926}, + {288, 67987}, + {289, 68048}, + {290, 68109}, + {291, 68170}, + {292, 68231}, + {293, 68292}, + {294, 68353}, + {295, 68414}, + {296, 68475}, + {297, 68536}, + {298, 68597}, + {299, 68658}, + {300, 68719}, + {301, 68780}, + {302, 68841}, + {303, 68902}, + {304, 68963}, + {305, 69024}, + {306, 69415}, + {307, 69806}, + {308, 70197}, + {309, 70588}, + {310, 70979}, + {311, 71370}, + {312, 71761}, + {313, 72152}, + {314, 72543}, + {315, 72934}, + {316, 73325}, + {317, 73716}, + {318, 74107}, + {319, 74498}, + {320, 74889}, + {321, 75280}, + {322, 75733}, + {323, 76186}, + {324, 76639}, + {325, 77092}, + {326, 77545}, + {327, 77998}, + {328, 78451}, + {329, 78904}, + {330, 79357}, + {331, 79810}, + {332, 80263}, + {333, 80716}, + {334, 81169}, + {335, 81622}, + {336, 82075}, + {338, 82649}, + {351, 83291}, + {352, 83381}, + {353, 83471}, + {354, 83561}, + {355, 83651}, + {356, 83741}, + {357, 83831}, + {358, 83921}, + {359, 84011}, + {360, 84101}, + {361, 84191}, + {362, 84281}, + {363, 84371}, + {364, 84461}, + {365, 84551}, + {366, 84641}, + {429, 94083}, + {430, 94166}, + {431, 94249}, + {432, 94332}, + {433, 94415}, + {434, 94498}, + {435, 94581}, + {436, 94664}, + {437, 94747}, + {438, 94830}, + {439, 94913}, + {440, 94996}, + {441, 95079}, + {442, 95162}, + {443, 95245}, + {444, 95328}, + {445, 95411}, + {446, 95494}, + {447, 95577}, + {448, 95660}, + {449, 95743}, + {450, 95826}, + {451, 95909}, + {452, 95992}, + {453, 96075}, + {454, 96158}, + {455, 96241}, + {456, 96324}, + {457, 96407}, + {458, 96490}, + {459, 96573}, + {460, 96656}, + {497, 98319}, + {498, 98573}, + {499, 98827}, + {500, 99081}, + {501, 99335}, + {502, 99589}, + {503, 99843}, + {504, 100097}, + {505, 100351}, + {506, 100605}, + {507, 100859}, + {508, 101113}, + {509, 101367}, + {510, 101621}, + {511, 101875}, + {512, 102129}, + {530, 104101}, + {531, 104164}, + {532, 104303}, + {533, 104442}, + {534, 104581}, + {536, 104725}, }; GpaPaddedCounterDesc kOglpPaddedCounterByGroupGfx103[] = { @@ -1672,7 +1672,6 @@ namespace counter_oglp_gfx103 const std::set kHwOglpTimestampBlockIdsGfx103 = {536}; ///< Timestamp block id's for OGLP for gfx103 family const std::set kHwOglpTimeCounterIndicesGfx103 = {104725, 104726, 104727, 104728, 104729, 104730}; ///< Timestamp counter indices for OGLP for gfx103 family const unsigned int kHwOglpGroupCountGfx103 = static_cast(kHwOglpGroupsGfx103.size()); - const unsigned int kHwOglpExposedCountersGroupCountGfx103 = 408; const unsigned int kOglpPaddedCounterGroupCountGfx103 = 0; const unsigned int kHwOglpSqGroupCountGfx103 = sizeof(kHwOglpSqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwOglpSqIsolatedGroupCountGfx103 = sizeof(kHwOglpSqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.h index cb6b5167..25feca78 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx103.h @@ -35,7 +35,6 @@ namespace counter_oglp_gfx103 extern const std::set kHwOglpTimestampBlockIdsGfx103; ///< Timestamp block id's for Oglp for Gfx103 family extern const std::set kHwOglpTimeCounterIndicesGfx103; ///< Timestamp counter indices for Oglp for Gfx103 family extern const unsigned int kHwOglpGroupCountGfx103; ///< Hardware Group Count for Oglp for Gfx103 family - extern const unsigned int kHwOglpExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Oglp for Gfx103 family extern const unsigned int kOglpPaddedCounterGroupCountGfx103; ///< reserved counter group count for Oglp for Gfx103 family extern const unsigned int kHwOglpSqGroupCountGfx103; ///< Hardware SQ Group Count for Oglp for Gfx103 family extern const unsigned int kHwOglpSqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Oglp for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.cc index f74933b8..9f336201 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.cc @@ -1674,766 +1674,766 @@ namespace counter_oglp_gfx11 }; GpaCounterGroupExposedCounterDesc kHwOglpExposedCountersByGroupGfx11[] = { - {0, 0, {0, 24}}, - {1, 44, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 355, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 666, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 977, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1288, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {6, 1599, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {7, 1910, {159, 235, 259}}, - {8, 2577, {159, 235, 259}}, - {9, 3244, {159, 235, 259}}, - {10, 3911, {159, 235, 259}}, - {11, 4578, {159, 235, 259}}, - {12, 5245, {159, 235, 259}}, - {13, 5912, {159, 235, 259}}, - {14, 6579, {159, 235, 259}}, - {15, 7246, {159, 235, 259}}, - {16, 7913, {159, 235, 259}}, - {17, 8580, {159, 235, 259}}, - {18, 9247, {159, 235, 259}}, - {19, 9914, {159, 235, 259}}, - {20, 10581, {159, 235, 259}}, - {21, 11248, {159, 235, 259}}, - {22, 11915, {159, 235, 259}}, - {23, 12582, {159, 235, 259}}, - {24, 13249, {159, 235, 259}}, - {25, 13916, {159, 235, 259}}, - {26, 14583, {159, 235, 259}}, - {27, 15250, {159, 235, 259}}, - {28, 15917, {159, 235, 259}}, - {29, 16584, {159, 235, 259}}, - {30, 17251, {159, 235, 259}}, - {31, 17918, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {32, 18202, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {33, 18486, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {34, 18770, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {35, 19054, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {36, 19338, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {37, 19622, {20, 21, 24}}, - {38, 19659, {20, 21, 24}}, - {39, 19696, {20, 21, 24}}, - {40, 19733, {20, 21, 24}}, - {41, 19770, {20, 21, 24}}, - {42, 19807, {20, 21, 24}}, - {43, 19844, {20, 21, 24}}, - {44, 19881, {20, 21, 24}}, - {45, 19918, {20, 21, 24}}, - {46, 19955, {20, 21, 24}}, - {47, 19992, {20, 21, 24}}, - {48, 20029, {20, 21, 24}}, - {49, 20066, {20, 21, 24}}, - {50, 20103, {20, 21, 24}}, - {51, 20140, {20, 21, 24}}, - {52, 20177, {20, 21, 24}}, - {53, 20214, {20, 21, 24}}, - {54, 20251, {20, 21, 24}}, - {55, 20288, {20, 21, 24}}, - {56, 20325, {20, 21, 24}}, - {57, 20362, {20, 21, 24}}, - {58, 20399, {20, 21, 24}}, - {59, 20436, {20, 21, 24}}, - {60, 20473, {20, 21, 24}}, - {61, 20510, {20, 21, 24}}, - {62, 20547, {20, 21, 24}}, - {63, 20584, {20, 21, 24}}, - {64, 20621, {20, 21, 24}}, - {65, 20658, {20, 21, 24}}, - {66, 20695, {20, 21, 24}}, - {67, 20732, {12, 14, 17, 19, 22, 24, 27, 29}}, - {68, 20814, {12, 14, 17, 19, 22, 24, 27, 29}}, - {69, 20896, {12, 14, 17, 19, 22, 24, 27, 29}}, - {70, 20978, {12, 14, 17, 19, 22, 24, 27, 29}}, - {71, 21060, {12, 14, 17, 19, 22, 24, 27, 29}}, - {72, 21142, {12, 14, 17, 19, 22, 24, 27, 29}}, - {73, 21224, {12, 14, 17, 19, 22, 24, 27, 29}}, - {74, 21306, {12, 14, 17, 19, 22, 24, 27, 29}}, - {75, 21388, {12, 14, 17, 19, 22, 24, 27, 29}}, - {76, 21470, {12, 14, 17, 19, 22, 24, 27, 29}}, - {77, 21552, {12, 14, 17, 19, 22, 24, 27, 29}}, - {78, 21634, {12, 14, 17, 19, 22, 24, 27, 29}}, - {79, 21716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 21952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 22188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 22424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 22660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 22896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 23132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 23368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 23604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 23840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 24076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 24312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 24548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 25020, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 25256, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 25492, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 25728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 25964, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 26200, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 26436, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 26672, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 26908, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 27144, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 27380, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 27616, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 27852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 28088, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 28324, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 28560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 28796, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 29032, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 29268, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 29504, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 29740, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 29976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 30212, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 30448, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 30684, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 30920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 31156, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 31392, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 31628, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 31864, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 32100, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 32336, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 32572, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 32808, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 33044, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 33280, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 33516, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 33752, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 33988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 34224, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 34460, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 34696, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 34932, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 35168, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 35404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 35640, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 35876, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 36112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 36348, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 36584, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 36820, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 37056, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 37292, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {146, 37528, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {147, 37764, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {148, 38000, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {149, 38236, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {150, 38472, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {151, 38708, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {152, 38944, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {153, 39180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {154, 39416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {155, 39652, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {156, 39888, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {157, 40124, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {158, 40360, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {159, 40596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {160, 40832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {161, 41068, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {162, 41304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {163, 41540, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {164, 41776, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {165, 42012, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {166, 42248, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {167, 42484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {168, 42720, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {169, 42956, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {170, 43192, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {171, 43428, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {172, 43664, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {173, 43900, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {174, 44136, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {175, 44372, {82, 116, 117, 118}}, - {176, 44569, {82, 116, 117, 118}}, - {177, 44766, {82, 116, 117, 118}}, - {178, 44963, {82, 116, 117, 118}}, - {179, 45160, {82, 116, 117, 118}}, - {180, 45357, {82, 116, 117, 118}}, - {181, 45554, {82, 116, 117, 118}}, - {182, 45751, {82, 116, 117, 118}}, - {183, 45948, {82, 116, 117, 118}}, - {184, 46145, {82, 116, 117, 118}}, - {185, 46342, {82, 116, 117, 118}}, - {186, 46539, {82, 116, 117, 118}}, - {187, 46736, {82, 116, 117, 118}}, - {188, 46933, {82, 116, 117, 118}}, - {189, 47130, {82, 116, 117, 118}}, - {190, 47327, {82, 116, 117, 118}}, - {191, 47524, {82, 116, 117, 118}}, - {192, 47721, {82, 116, 117, 118}}, - {193, 47918, {82, 116, 117, 118}}, - {194, 48115, {82, 116, 117, 118}}, - {195, 48312, {82, 116, 117, 118}}, - {196, 48509, {82, 116, 117, 118}}, - {197, 48706, {82, 116, 117, 118}}, - {198, 48903, {82, 116, 117, 118}}, - {199, 49100, {82, 116, 117, 118}}, - {200, 49297, {82, 116, 117, 118}}, - {201, 49494, {82, 116, 117, 118}}, - {202, 49691, {82, 116, 117, 118}}, - {203, 49888, {82, 116, 117, 118}}, - {204, 50085, {82, 116, 117, 118}}, - {205, 50282, {82, 116, 117, 118}}, - {206, 50479, {82, 116, 117, 118}}, - {207, 50676, {82, 116, 117, 118}}, - {208, 50873, {82, 116, 117, 118}}, - {209, 51070, {82, 116, 117, 118}}, - {210, 51267, {82, 116, 117, 118}}, - {211, 51464, {82, 116, 117, 118}}, - {212, 51661, {82, 116, 117, 118}}, - {213, 51858, {82, 116, 117, 118}}, - {214, 52055, {82, 116, 117, 118}}, - {215, 52252, {82, 116, 117, 118}}, - {216, 52449, {82, 116, 117, 118}}, - {217, 52646, {82, 116, 117, 118}}, - {218, 52843, {82, 116, 117, 118}}, - {219, 53040, {82, 116, 117, 118}}, - {220, 53237, {82, 116, 117, 118}}, - {221, 53434, {82, 116, 117, 118}}, - {222, 53631, {82, 116, 117, 118}}, - {223, 53828, {82, 116, 117, 118}}, - {224, 54025, {82, 116, 117, 118}}, - {225, 54222, {82, 116, 117, 118}}, - {226, 54419, {82, 116, 117, 118}}, - {227, 54616, {82, 116, 117, 118}}, - {228, 54813, {82, 116, 117, 118}}, - {229, 55010, {82, 116, 117, 118}}, - {230, 55207, {82, 116, 117, 118}}, - {231, 55404, {82, 116, 117, 118}}, - {232, 55601, {82, 116, 117, 118}}, - {233, 55798, {82, 116, 117, 118}}, - {234, 55995, {82, 116, 117, 118}}, - {235, 56192, {82, 116, 117, 118}}, - {236, 56389, {82, 116, 117, 118}}, - {237, 56586, {82, 116, 117, 118}}, - {238, 56783, {82, 116, 117, 118}}, - {239, 56980, {82, 116, 117, 118}}, - {240, 57177, {82, 116, 117, 118}}, - {241, 57374, {82, 116, 117, 118}}, - {242, 57571, {82, 116, 117, 118}}, - {243, 57768, {82, 116, 117, 118}}, - {244, 57965, {82, 116, 117, 118}}, - {245, 58162, {82, 116, 117, 118}}, - {246, 58359, {82, 116, 117, 118}}, - {247, 58556, {82, 116, 117, 118}}, - {248, 58753, {82, 116, 117, 118}}, - {249, 58950, {82, 116, 117, 118}}, - {250, 59147, {82, 116, 117, 118}}, - {251, 59344, {82, 116, 117, 118}}, - {252, 59541, {82, 116, 117, 118}}, - {253, 59738, {82, 116, 117, 118}}, - {254, 59935, {82, 116, 117, 118}}, - {255, 60132, {82, 116, 117, 118}}, - {256, 60329, {82, 116, 117, 118}}, - {257, 60526, {82, 116, 117, 118}}, - {258, 60723, {82, 116, 117, 118}}, - {259, 60920, {82, 116, 117, 118}}, - {260, 61117, {82, 116, 117, 118}}, - {261, 61314, {82, 116, 117, 118}}, - {262, 61511, {82, 116, 117, 118}}, - {263, 61708, {82, 116, 117, 118}}, - {264, 61905, {82, 116, 117, 118}}, - {265, 62102, {82, 116, 117, 118}}, - {266, 62299, {82, 116, 117, 118}}, - {267, 62496, {82, 116, 117, 118}}, - {268, 62693, {82, 116, 117, 118}}, - {269, 62890, {82, 116, 117, 118}}, - {270, 63087, {82, 116, 117, 118}}, - {271, 63284, {9, 17, 39, 46, 47, 48}}, - {272, 63362, {9, 17, 39, 46, 47, 48}}, - {273, 63440, {9, 17, 39, 46, 47, 48}}, - {274, 63518, {9, 17, 39, 46, 47, 48}}, - {275, 63596, {9, 17, 39, 46, 47, 48}}, - {276, 63674, {9, 17, 39, 46, 47, 48}}, - {277, 63752, {9, 17, 39, 46, 47, 48}}, - {278, 63830, {9, 17, 39, 46, 47, 48}}, - {279, 63908, {9, 17, 39, 46, 47, 48}}, - {280, 63986, {9, 17, 39, 46, 47, 48}}, - {281, 64064, {9, 17, 39, 46, 47, 48}}, - {282, 64142, {9, 17, 39, 46, 47, 48}}, - {283, 64220, {9, 17, 39, 46, 47, 48}}, - {284, 64298, {9, 17, 39, 46, 47, 48}}, - {285, 64376, {9, 17, 39, 46, 47, 48}}, - {286, 64454, {9, 17, 39, 46, 47, 48}}, - {287, 64532, {9, 17, 39, 46, 47, 48}}, - {288, 64610, {9, 17, 39, 46, 47, 48}}, - {289, 64688, {9, 17, 39, 46, 47, 48}}, - {290, 64766, {9, 17, 39, 46, 47, 48}}, - {291, 64844, {9, 17, 39, 46, 47, 48}}, - {292, 64922, {9, 17, 39, 46, 47, 48}}, - {293, 65000, {9, 17, 39, 46, 47, 48}}, - {294, 65078, {9, 17, 39, 46, 47, 48}}, - {295, 65156, {9, 17, 39, 46, 47, 48}}, - {296, 65234, {9, 17, 39, 46, 47, 48}}, - {297, 65312, {9, 17, 39, 46, 47, 48}}, - {298, 65390, {9, 17, 39, 46, 47, 48}}, - {299, 65468, {9, 17, 39, 46, 47, 48}}, - {300, 65546, {9, 17, 39, 46, 47, 48}}, - {301, 65624, {9, 17, 39, 46, 47, 48}}, - {302, 65702, {9, 17, 39, 46, 47, 48}}, - {303, 65780, {9, 17, 39, 46, 47, 48}}, - {304, 65858, {9, 17, 39, 46, 47, 48}}, - {305, 65936, {9, 17, 39, 46, 47, 48}}, - {306, 66014, {9, 17, 39, 46, 47, 48}}, - {307, 66092, {9, 17, 39, 46, 47, 48}}, - {308, 66170, {9, 17, 39, 46, 47, 48}}, - {309, 66248, {9, 17, 39, 46, 47, 48}}, - {310, 66326, {9, 17, 39, 46, 47, 48}}, - {311, 66404, {9, 17, 39, 46, 47, 48}}, - {312, 66482, {9, 17, 39, 46, 47, 48}}, - {313, 66560, {9, 17, 39, 46, 47, 48}}, - {314, 66638, {9, 17, 39, 46, 47, 48}}, - {315, 66716, {9, 17, 39, 46, 47, 48}}, - {316, 66794, {9, 17, 39, 46, 47, 48}}, - {317, 66872, {9, 17, 39, 46, 47, 48}}, - {318, 66950, {9, 17, 39, 46, 47, 48}}, - {319, 67028, {9, 17, 39, 46, 47, 48}}, - {320, 67106, {9, 17, 39, 46, 47, 48}}, - {321, 67184, {9, 17, 39, 46, 47, 48}}, - {322, 67262, {9, 17, 39, 46, 47, 48}}, - {323, 67340, {9, 17, 39, 46, 47, 48}}, - {324, 67418, {9, 17, 39, 46, 47, 48}}, - {325, 67496, {9, 17, 39, 46, 47, 48}}, - {326, 67574, {9, 17, 39, 46, 47, 48}}, - {327, 67652, {9, 17, 39, 46, 47, 48}}, - {328, 67730, {9, 17, 39, 46, 47, 48}}, - {329, 67808, {9, 17, 39, 46, 47, 48}}, - {330, 67886, {9, 17, 39, 46, 47, 48}}, - {331, 67964, {9, 17, 39, 46, 47, 48}}, - {332, 68042, {9, 17, 39, 46, 47, 48}}, - {333, 68120, {9, 17, 39, 46, 47, 48}}, - {334, 68198, {9, 17, 39, 46, 47, 48}}, - {335, 68276, {9, 17, 39, 46, 47, 48}}, - {336, 68354, {9, 17, 39, 46, 47, 48}}, - {337, 68432, {9, 17, 39, 46, 47, 48}}, - {338, 68510, {9, 17, 39, 46, 47, 48}}, - {339, 68588, {9, 17, 39, 46, 47, 48}}, - {340, 68666, {9, 17, 39, 46, 47, 48}}, - {341, 68744, {9, 17, 39, 46, 47, 48}}, - {342, 68822, {9, 17, 39, 46, 47, 48}}, - {343, 68900, {9, 17, 39, 46, 47, 48}}, - {344, 68978, {9, 17, 39, 46, 47, 48}}, - {345, 69056, {9, 17, 39, 46, 47, 48}}, - {346, 69134, {9, 17, 39, 46, 47, 48}}, - {347, 69212, {9, 17, 39, 46, 47, 48}}, - {348, 69290, {9, 17, 39, 46, 47, 48}}, - {349, 69368, {9, 17, 39, 46, 47, 48}}, - {350, 69446, {9, 17, 39, 46, 47, 48}}, - {351, 69524, {9, 17, 39, 46, 47, 48}}, - {352, 69602, {9, 17, 39, 46, 47, 48}}, - {353, 69680, {9, 17, 39, 46, 47, 48}}, - {354, 69758, {9, 17, 39, 46, 47, 48}}, - {355, 69836, {9, 17, 39, 46, 47, 48}}, - {356, 69914, {9, 17, 39, 46, 47, 48}}, - {357, 69992, {9, 17, 39, 46, 47, 48}}, - {358, 70070, {9, 17, 39, 46, 47, 48}}, - {359, 70148, {9, 17, 39, 46, 47, 48}}, - {360, 70226, {9, 17, 39, 46, 47, 48}}, - {361, 70304, {9, 17, 39, 46, 47, 48}}, - {362, 70382, {9, 17, 39, 46, 47, 48}}, - {363, 70460, {9, 17, 39, 46, 47, 48}}, - {364, 70538, {9, 17, 39, 46, 47, 48}}, - {365, 70616, {9, 17, 39, 46, 47, 48}}, - {366, 70694, {9, 17, 39, 46, 47, 48}}, - {367, 70772, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {368, 71160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {369, 71548, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {370, 71936, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {371, 72324, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {372, 72712, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {373, 73100, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {374, 73488, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {375, 73876, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {376, 74264, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {377, 74652, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {378, 75040, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {379, 75428, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {380, 75816, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {381, 76204, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {382, 76592, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {383, 76980, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {384, 77368, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {385, 77756, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {386, 78144, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {387, 78532, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {388, 78920, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {389, 79308, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {390, 79696, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {391, 80084, {5, 19, 21, 30, 32}}, - {392, 80398, {5, 19, 21, 30, 32}}, - {393, 80712, {5, 19, 21, 30, 32}}, - {394, 81026, {5, 19, 21, 30, 32}}, - {395, 81340, {5, 19, 21, 30, 32}}, - {396, 81654, {5, 19, 21, 30, 32}}, - {397, 81968, {5, 19, 21, 30, 32}}, - {398, 82282, {5, 19, 21, 30, 32}}, - {399, 82596, {5, 19, 21, 30, 32}}, - {400, 82910, {5, 19, 21, 30, 32}}, - {401, 83224, {5, 19, 21, 30, 32}}, - {402, 83538, {5, 19, 21, 30, 32}}, - {403, 83852, {5, 19, 21, 30, 32}}, - {404, 84166, {5, 19, 21, 30, 32}}, - {405, 84480, {5, 19, 21, 30, 32}}, - {406, 84794, {5, 19, 21, 30, 32}}, - {407, 85108, {5, 19, 21, 30, 32}}, - {408, 85422, {5, 19, 21, 30, 32}}, - {409, 85736, {5, 19, 21, 30, 32}}, - {410, 86050, {5, 19, 21, 30, 32}}, - {411, 86364, {5, 19, 21, 30, 32}}, - {412, 86678, {5, 19, 21, 30, 32}}, - {413, 86992, {5, 19, 21, 30, 32}}, - {414, 87306, {5, 19, 21, 30, 32}}, - {416, 87768, {0, 2}}, - {433, 88796, {55, 57}}, - {434, 88894, {55, 57}}, - {435, 88992, {55, 57}}, - {436, 89090, {55, 57}}, - {437, 89188, {55, 57}}, - {438, 89286, {55, 57}}, - {439, 89384, {55, 57}}, - {440, 89482, {55, 57}}, - {441, 89580, {55, 57}}, - {442, 89678, {55, 57}}, - {443, 89776, {55, 57}}, - {444, 89874, {55, 57}}, - {445, 89972, {55, 57}}, - {446, 90070, {55, 57}}, - {447, 90168, {55, 57}}, - {448, 90266, {55, 57}}, - {449, 90364, {55, 57}}, - {450, 90462, {55, 57}}, - {451, 90560, {55, 57}}, - {452, 90658, {55, 57}}, - {453, 90756, {55, 57}}, - {454, 90854, {55, 57}}, - {455, 90952, {55, 57}}, - {456, 91050, {55, 57}}, - {543, 99172, {14, 18}}, - {544, 99256, {14, 18}}, - {545, 99340, {14, 18}}, - {546, 99424, {14, 18}}, - {547, 99508, {14, 18}}, - {548, 99592, {14, 18}}, - {549, 99676, {14, 18}}, - {550, 99760, {14, 18}}, - {551, 99844, {14, 18}}, - {552, 99928, {14, 18}}, - {553, 100012, {14, 18}}, - {554, 100096, {14, 18}}, - {555, 100180, {14, 18}}, - {556, 100264, {14, 18}}, - {557, 100348, {14, 18}}, - {558, 100432, {14, 18}}, - {559, 100516, {14, 18}}, - {560, 100600, {14, 18}}, - {561, 100684, {14, 18}}, - {562, 100768, {14, 18}}, - {563, 100852, {14, 18}}, - {564, 100936, {14, 18}}, - {565, 101020, {14, 18}}, - {566, 101104, {14, 18}}, - {567, 101188, {14, 18}}, - {568, 101272, {14, 18}}, - {569, 101356, {14, 18}}, - {570, 101440, {14, 18}}, - {571, 101524, {14, 18}}, - {572, 101608, {14, 18}}, - {573, 101692, {14, 18}}, - {574, 101776, {14, 18}}, - {575, 101860, {14, 18}}, - {576, 101944, {14, 18}}, - {577, 102028, {14, 18}}, - {578, 102112, {14, 18}}, - {579, 102196, {14, 18}}, - {580, 102280, {14, 18}}, - {581, 102364, {14, 18}}, - {582, 102448, {14, 18}}, - {583, 102532, {14, 18}}, - {584, 102616, {14, 18}}, - {585, 102700, {14, 18}}, - {586, 102784, {14, 18}}, - {587, 102868, {14, 18}}, - {588, 102952, {14, 18}}, - {589, 103036, {14, 18}}, - {590, 103120, {14, 18}}, - {595, 103636, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {596, 103895, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {597, 104154, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {598, 104413, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {599, 104672, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {600, 104931, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {601, 105190, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {602, 105449, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {603, 105708, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {604, 105967, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {605, 106226, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {606, 106485, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {607, 106744, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {608, 107003, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {609, 107262, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {610, 107521, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {611, 107780, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {612, 108039, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {613, 108298, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {614, 108557, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {615, 108816, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {616, 109075, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {617, 109334, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {618, 109593, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {640, 112259, {39}}, - {641, 112360, {0, 12, 17, 23, 79, 80}}, - {642, 112448, {0, 12, 17, 23, 79, 80}}, - {643, 112536, {0, 12, 17, 23, 79, 80}}, - {644, 112624, {0, 12, 17, 23, 79, 80}}, - {645, 112712, {0, 12, 17, 23, 79, 80}}, - {646, 112800, {0, 12, 17, 23, 79, 80}}, - {647, 112888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {648, 113400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {649, 113912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {650, 114424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {651, 114936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {652, 115448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {653, 115960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {654, 116472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {655, 116984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {656, 117496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {657, 118008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {658, 118520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {659, 119032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {660, 119544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {661, 120056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {662, 120568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {663, 121080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {664, 121592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {665, 122104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {666, 122616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {667, 123128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {668, 123640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {669, 124152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {670, 124664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {671, 125176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {672, 125688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {673, 126200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {674, 126712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {675, 127224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {676, 127736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {677, 128248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {678, 128760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {679, 129272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {680, 129784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {681, 130296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {682, 130808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {683, 131320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {684, 131832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {685, 132344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {686, 132856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {687, 133368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {688, 133880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {689, 134392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {690, 134904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {691, 135416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {692, 135928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {693, 136440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {694, 136952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {695, 137464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {696, 137976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {697, 138488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {698, 139000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {699, 139512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {700, 140024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {701, 140536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {702, 141048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {703, 141560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {704, 142072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {705, 142584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {706, 143096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {707, 143608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {708, 144120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {709, 144632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {710, 145144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {711, 145656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {712, 146168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {713, 146680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {714, 147192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {715, 147704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {716, 148216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {717, 148728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {718, 149240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {719, 149752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {720, 150264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {721, 150776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {722, 151288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {723, 151800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {724, 152312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {725, 152824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {726, 153336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {727, 153848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {728, 154360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {729, 154872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {730, 155384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {731, 155896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {732, 156408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {733, 156920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {734, 157432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {735, 157944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {736, 158456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {737, 158968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {738, 159480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {739, 159992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {740, 160504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {741, 161016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {742, 161528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {743, 162040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {744, 162552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {745, 163064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {746, 163576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {747, 164088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {748, 164600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {749, 165112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {750, 165624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {751, 166136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {752, 166648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {753, 167160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {754, 167672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {755, 168184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {756, 168696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {757, 169208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {758, 169720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {759, 170232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {760, 170744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {761, 171256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {762, 171768, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {763, 172280, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {764, 172792, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {765, 173304, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {766, 173816, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {767, 174328, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {768, 174840, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {769, 175352, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {770, 175864, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {771, 176376, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {772, 176888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {773, 177400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {774, 177912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {775, 178424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {776, 178936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {777, 179448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {778, 179960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {779, 180472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {780, 180984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {781, 181496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {782, 182008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {783, 182520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {784, 183032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {785, 183544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {786, 184056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {787, 184568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {788, 185080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {789, 185592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {790, 186104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {791, 186616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {792, 187128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {793, 187640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {794, 188152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {795, 188664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {796, 189176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {797, 189688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {798, 190200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {799, 190712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {800, 191224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {801, 191736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {802, 192248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {803, 192760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {804, 193272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {805, 193784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {806, 194296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {807, 194808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {808, 195320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {809, 195832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {810, 196344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {811, 196856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {812, 197368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {813, 197880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {814, 198392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {815, 198904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {816, 199416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {817, 199928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {818, 200440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {819, 200952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {820, 201464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {821, 201976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {822, 202488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {823, 203000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {824, 203512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {825, 204024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {826, 204536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {827, 205048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {828, 205560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {829, 206072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {830, 206584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {831, 207096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {832, 207608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {833, 208120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {834, 208632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {835, 209144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {836, 209656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {837, 210168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {838, 210680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {839, 211192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {840, 211704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {841, 212216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {842, 212728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {843, 213240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {844, 213752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {845, 214264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {846, 214776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {847, 215288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {848, 215800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {849, 216312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {850, 216824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {851, 217336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {852, 217848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {853, 218360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {854, 218872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {855, 219384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {856, 219896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {857, 220408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {858, 220920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {859, 221432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {860, 221944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {861, 222456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {862, 222968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {863, 223480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {864, 223992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {865, 224504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {866, 225016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {867, 225528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {868, 226040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {869, 226552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {870, 227064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {871, 227576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {872, 228088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {873, 228600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {874, 229112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {875, 229624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {876, 230136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {877, 230648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {878, 231160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {879, 231672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {880, 232184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {881, 232696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {882, 233208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {883, 233720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {884, 234232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {885, 234744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {886, 235256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {888, 235773, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 44}, + {2, 355}, + {3, 666}, + {4, 977}, + {5, 1288}, + {6, 1599}, + {7, 1910}, + {8, 2577}, + {9, 3244}, + {10, 3911}, + {11, 4578}, + {12, 5245}, + {13, 5912}, + {14, 6579}, + {15, 7246}, + {16, 7913}, + {17, 8580}, + {18, 9247}, + {19, 9914}, + {20, 10581}, + {21, 11248}, + {22, 11915}, + {23, 12582}, + {24, 13249}, + {25, 13916}, + {26, 14583}, + {27, 15250}, + {28, 15917}, + {29, 16584}, + {30, 17251}, + {31, 17918}, + {32, 18202}, + {33, 18486}, + {34, 18770}, + {35, 19054}, + {36, 19338}, + {37, 19622}, + {38, 19659}, + {39, 19696}, + {40, 19733}, + {41, 19770}, + {42, 19807}, + {43, 19844}, + {44, 19881}, + {45, 19918}, + {46, 19955}, + {47, 19992}, + {48, 20029}, + {49, 20066}, + {50, 20103}, + {51, 20140}, + {52, 20177}, + {53, 20214}, + {54, 20251}, + {55, 20288}, + {56, 20325}, + {57, 20362}, + {58, 20399}, + {59, 20436}, + {60, 20473}, + {61, 20510}, + {62, 20547}, + {63, 20584}, + {64, 20621}, + {65, 20658}, + {66, 20695}, + {67, 20732}, + {68, 20814}, + {69, 20896}, + {70, 20978}, + {71, 21060}, + {72, 21142}, + {73, 21224}, + {74, 21306}, + {75, 21388}, + {76, 21470}, + {77, 21552}, + {78, 21634}, + {79, 21716}, + {80, 21952}, + {81, 22188}, + {82, 22424}, + {83, 22660}, + {84, 22896}, + {85, 23132}, + {86, 23368}, + {87, 23604}, + {88, 23840}, + {89, 24076}, + {90, 24312}, + {91, 24548}, + {92, 24784}, + {93, 25020}, + {94, 25256}, + {95, 25492}, + {96, 25728}, + {97, 25964}, + {98, 26200}, + {99, 26436}, + {100, 26672}, + {101, 26908}, + {102, 27144}, + {103, 27380}, + {104, 27616}, + {105, 27852}, + {106, 28088}, + {107, 28324}, + {108, 28560}, + {109, 28796}, + {110, 29032}, + {111, 29268}, + {112, 29504}, + {113, 29740}, + {114, 29976}, + {115, 30212}, + {116, 30448}, + {117, 30684}, + {118, 30920}, + {119, 31156}, + {120, 31392}, + {121, 31628}, + {122, 31864}, + {123, 32100}, + {124, 32336}, + {125, 32572}, + {126, 32808}, + {127, 33044}, + {128, 33280}, + {129, 33516}, + {130, 33752}, + {131, 33988}, + {132, 34224}, + {133, 34460}, + {134, 34696}, + {135, 34932}, + {136, 35168}, + {137, 35404}, + {138, 35640}, + {139, 35876}, + {140, 36112}, + {141, 36348}, + {142, 36584}, + {143, 36820}, + {144, 37056}, + {145, 37292}, + {146, 37528}, + {147, 37764}, + {148, 38000}, + {149, 38236}, + {150, 38472}, + {151, 38708}, + {152, 38944}, + {153, 39180}, + {154, 39416}, + {155, 39652}, + {156, 39888}, + {157, 40124}, + {158, 40360}, + {159, 40596}, + {160, 40832}, + {161, 41068}, + {162, 41304}, + {163, 41540}, + {164, 41776}, + {165, 42012}, + {166, 42248}, + {167, 42484}, + {168, 42720}, + {169, 42956}, + {170, 43192}, + {171, 43428}, + {172, 43664}, + {173, 43900}, + {174, 44136}, + {175, 44372}, + {176, 44569}, + {177, 44766}, + {178, 44963}, + {179, 45160}, + {180, 45357}, + {181, 45554}, + {182, 45751}, + {183, 45948}, + {184, 46145}, + {185, 46342}, + {186, 46539}, + {187, 46736}, + {188, 46933}, + {189, 47130}, + {190, 47327}, + {191, 47524}, + {192, 47721}, + {193, 47918}, + {194, 48115}, + {195, 48312}, + {196, 48509}, + {197, 48706}, + {198, 48903}, + {199, 49100}, + {200, 49297}, + {201, 49494}, + {202, 49691}, + {203, 49888}, + {204, 50085}, + {205, 50282}, + {206, 50479}, + {207, 50676}, + {208, 50873}, + {209, 51070}, + {210, 51267}, + {211, 51464}, + {212, 51661}, + {213, 51858}, + {214, 52055}, + {215, 52252}, + {216, 52449}, + {217, 52646}, + {218, 52843}, + {219, 53040}, + {220, 53237}, + {221, 53434}, + {222, 53631}, + {223, 53828}, + {224, 54025}, + {225, 54222}, + {226, 54419}, + {227, 54616}, + {228, 54813}, + {229, 55010}, + {230, 55207}, + {231, 55404}, + {232, 55601}, + {233, 55798}, + {234, 55995}, + {235, 56192}, + {236, 56389}, + {237, 56586}, + {238, 56783}, + {239, 56980}, + {240, 57177}, + {241, 57374}, + {242, 57571}, + {243, 57768}, + {244, 57965}, + {245, 58162}, + {246, 58359}, + {247, 58556}, + {248, 58753}, + {249, 58950}, + {250, 59147}, + {251, 59344}, + {252, 59541}, + {253, 59738}, + {254, 59935}, + {255, 60132}, + {256, 60329}, + {257, 60526}, + {258, 60723}, + {259, 60920}, + {260, 61117}, + {261, 61314}, + {262, 61511}, + {263, 61708}, + {264, 61905}, + {265, 62102}, + {266, 62299}, + {267, 62496}, + {268, 62693}, + {269, 62890}, + {270, 63087}, + {271, 63284}, + {272, 63362}, + {273, 63440}, + {274, 63518}, + {275, 63596}, + {276, 63674}, + {277, 63752}, + {278, 63830}, + {279, 63908}, + {280, 63986}, + {281, 64064}, + {282, 64142}, + {283, 64220}, + {284, 64298}, + {285, 64376}, + {286, 64454}, + {287, 64532}, + {288, 64610}, + {289, 64688}, + {290, 64766}, + {291, 64844}, + {292, 64922}, + {293, 65000}, + {294, 65078}, + {295, 65156}, + {296, 65234}, + {297, 65312}, + {298, 65390}, + {299, 65468}, + {300, 65546}, + {301, 65624}, + {302, 65702}, + {303, 65780}, + {304, 65858}, + {305, 65936}, + {306, 66014}, + {307, 66092}, + {308, 66170}, + {309, 66248}, + {310, 66326}, + {311, 66404}, + {312, 66482}, + {313, 66560}, + {314, 66638}, + {315, 66716}, + {316, 66794}, + {317, 66872}, + {318, 66950}, + {319, 67028}, + {320, 67106}, + {321, 67184}, + {322, 67262}, + {323, 67340}, + {324, 67418}, + {325, 67496}, + {326, 67574}, + {327, 67652}, + {328, 67730}, + {329, 67808}, + {330, 67886}, + {331, 67964}, + {332, 68042}, + {333, 68120}, + {334, 68198}, + {335, 68276}, + {336, 68354}, + {337, 68432}, + {338, 68510}, + {339, 68588}, + {340, 68666}, + {341, 68744}, + {342, 68822}, + {343, 68900}, + {344, 68978}, + {345, 69056}, + {346, 69134}, + {347, 69212}, + {348, 69290}, + {349, 69368}, + {350, 69446}, + {351, 69524}, + {352, 69602}, + {353, 69680}, + {354, 69758}, + {355, 69836}, + {356, 69914}, + {357, 69992}, + {358, 70070}, + {359, 70148}, + {360, 70226}, + {361, 70304}, + {362, 70382}, + {363, 70460}, + {364, 70538}, + {365, 70616}, + {366, 70694}, + {367, 70772}, + {368, 71160}, + {369, 71548}, + {370, 71936}, + {371, 72324}, + {372, 72712}, + {373, 73100}, + {374, 73488}, + {375, 73876}, + {376, 74264}, + {377, 74652}, + {378, 75040}, + {379, 75428}, + {380, 75816}, + {381, 76204}, + {382, 76592}, + {383, 76980}, + {384, 77368}, + {385, 77756}, + {386, 78144}, + {387, 78532}, + {388, 78920}, + {389, 79308}, + {390, 79696}, + {391, 80084}, + {392, 80398}, + {393, 80712}, + {394, 81026}, + {395, 81340}, + {396, 81654}, + {397, 81968}, + {398, 82282}, + {399, 82596}, + {400, 82910}, + {401, 83224}, + {402, 83538}, + {403, 83852}, + {404, 84166}, + {405, 84480}, + {406, 84794}, + {407, 85108}, + {408, 85422}, + {409, 85736}, + {410, 86050}, + {411, 86364}, + {412, 86678}, + {413, 86992}, + {414, 87306}, + {416, 87768}, + {433, 88796}, + {434, 88894}, + {435, 88992}, + {436, 89090}, + {437, 89188}, + {438, 89286}, + {439, 89384}, + {440, 89482}, + {441, 89580}, + {442, 89678}, + {443, 89776}, + {444, 89874}, + {445, 89972}, + {446, 90070}, + {447, 90168}, + {448, 90266}, + {449, 90364}, + {450, 90462}, + {451, 90560}, + {452, 90658}, + {453, 90756}, + {454, 90854}, + {455, 90952}, + {456, 91050}, + {543, 99172}, + {544, 99256}, + {545, 99340}, + {546, 99424}, + {547, 99508}, + {548, 99592}, + {549, 99676}, + {550, 99760}, + {551, 99844}, + {552, 99928}, + {553, 100012}, + {554, 100096}, + {555, 100180}, + {556, 100264}, + {557, 100348}, + {558, 100432}, + {559, 100516}, + {560, 100600}, + {561, 100684}, + {562, 100768}, + {563, 100852}, + {564, 100936}, + {565, 101020}, + {566, 101104}, + {567, 101188}, + {568, 101272}, + {569, 101356}, + {570, 101440}, + {571, 101524}, + {572, 101608}, + {573, 101692}, + {574, 101776}, + {575, 101860}, + {576, 101944}, + {577, 102028}, + {578, 102112}, + {579, 102196}, + {580, 102280}, + {581, 102364}, + {582, 102448}, + {583, 102532}, + {584, 102616}, + {585, 102700}, + {586, 102784}, + {587, 102868}, + {588, 102952}, + {589, 103036}, + {590, 103120}, + {595, 103636}, + {596, 103895}, + {597, 104154}, + {598, 104413}, + {599, 104672}, + {600, 104931}, + {601, 105190}, + {602, 105449}, + {603, 105708}, + {604, 105967}, + {605, 106226}, + {606, 106485}, + {607, 106744}, + {608, 107003}, + {609, 107262}, + {610, 107521}, + {611, 107780}, + {612, 108039}, + {613, 108298}, + {614, 108557}, + {615, 108816}, + {616, 109075}, + {617, 109334}, + {618, 109593}, + {640, 112259}, + {641, 112360}, + {642, 112448}, + {643, 112536}, + {644, 112624}, + {645, 112712}, + {646, 112800}, + {647, 112888}, + {648, 113400}, + {649, 113912}, + {650, 114424}, + {651, 114936}, + {652, 115448}, + {653, 115960}, + {654, 116472}, + {655, 116984}, + {656, 117496}, + {657, 118008}, + {658, 118520}, + {659, 119032}, + {660, 119544}, + {661, 120056}, + {662, 120568}, + {663, 121080}, + {664, 121592}, + {665, 122104}, + {666, 122616}, + {667, 123128}, + {668, 123640}, + {669, 124152}, + {670, 124664}, + {671, 125176}, + {672, 125688}, + {673, 126200}, + {674, 126712}, + {675, 127224}, + {676, 127736}, + {677, 128248}, + {678, 128760}, + {679, 129272}, + {680, 129784}, + {681, 130296}, + {682, 130808}, + {683, 131320}, + {684, 131832}, + {685, 132344}, + {686, 132856}, + {687, 133368}, + {688, 133880}, + {689, 134392}, + {690, 134904}, + {691, 135416}, + {692, 135928}, + {693, 136440}, + {694, 136952}, + {695, 137464}, + {696, 137976}, + {697, 138488}, + {698, 139000}, + {699, 139512}, + {700, 140024}, + {701, 140536}, + {702, 141048}, + {703, 141560}, + {704, 142072}, + {705, 142584}, + {706, 143096}, + {707, 143608}, + {708, 144120}, + {709, 144632}, + {710, 145144}, + {711, 145656}, + {712, 146168}, + {713, 146680}, + {714, 147192}, + {715, 147704}, + {716, 148216}, + {717, 148728}, + {718, 149240}, + {719, 149752}, + {720, 150264}, + {721, 150776}, + {722, 151288}, + {723, 151800}, + {724, 152312}, + {725, 152824}, + {726, 153336}, + {727, 153848}, + {728, 154360}, + {729, 154872}, + {730, 155384}, + {731, 155896}, + {732, 156408}, + {733, 156920}, + {734, 157432}, + {735, 157944}, + {736, 158456}, + {737, 158968}, + {738, 159480}, + {739, 159992}, + {740, 160504}, + {741, 161016}, + {742, 161528}, + {743, 162040}, + {744, 162552}, + {745, 163064}, + {746, 163576}, + {747, 164088}, + {748, 164600}, + {749, 165112}, + {750, 165624}, + {751, 166136}, + {752, 166648}, + {753, 167160}, + {754, 167672}, + {755, 168184}, + {756, 168696}, + {757, 169208}, + {758, 169720}, + {759, 170232}, + {760, 170744}, + {761, 171256}, + {762, 171768}, + {763, 172280}, + {764, 172792}, + {765, 173304}, + {766, 173816}, + {767, 174328}, + {768, 174840}, + {769, 175352}, + {770, 175864}, + {771, 176376}, + {772, 176888}, + {773, 177400}, + {774, 177912}, + {775, 178424}, + {776, 178936}, + {777, 179448}, + {778, 179960}, + {779, 180472}, + {780, 180984}, + {781, 181496}, + {782, 182008}, + {783, 182520}, + {784, 183032}, + {785, 183544}, + {786, 184056}, + {787, 184568}, + {788, 185080}, + {789, 185592}, + {790, 186104}, + {791, 186616}, + {792, 187128}, + {793, 187640}, + {794, 188152}, + {795, 188664}, + {796, 189176}, + {797, 189688}, + {798, 190200}, + {799, 190712}, + {800, 191224}, + {801, 191736}, + {802, 192248}, + {803, 192760}, + {804, 193272}, + {805, 193784}, + {806, 194296}, + {807, 194808}, + {808, 195320}, + {809, 195832}, + {810, 196344}, + {811, 196856}, + {812, 197368}, + {813, 197880}, + {814, 198392}, + {815, 198904}, + {816, 199416}, + {817, 199928}, + {818, 200440}, + {819, 200952}, + {820, 201464}, + {821, 201976}, + {822, 202488}, + {823, 203000}, + {824, 203512}, + {825, 204024}, + {826, 204536}, + {827, 205048}, + {828, 205560}, + {829, 206072}, + {830, 206584}, + {831, 207096}, + {832, 207608}, + {833, 208120}, + {834, 208632}, + {835, 209144}, + {836, 209656}, + {837, 210168}, + {838, 210680}, + {839, 211192}, + {840, 211704}, + {841, 212216}, + {842, 212728}, + {843, 213240}, + {844, 213752}, + {845, 214264}, + {846, 214776}, + {847, 215288}, + {848, 215800}, + {849, 216312}, + {850, 216824}, + {851, 217336}, + {852, 217848}, + {853, 218360}, + {854, 218872}, + {855, 219384}, + {856, 219896}, + {857, 220408}, + {858, 220920}, + {859, 221432}, + {860, 221944}, + {861, 222456}, + {862, 222968}, + {863, 223480}, + {864, 223992}, + {865, 224504}, + {866, 225016}, + {867, 225528}, + {868, 226040}, + {869, 226552}, + {870, 227064}, + {871, 227576}, + {872, 228088}, + {873, 228600}, + {874, 229112}, + {875, 229624}, + {876, 230136}, + {877, 230648}, + {878, 231160}, + {879, 231672}, + {880, 232184}, + {881, 232696}, + {882, 233208}, + {883, 233720}, + {884, 234232}, + {885, 234744}, + {886, 235256}, + {888, 235773}, }; GpaPaddedCounterDesc kOglpPaddedCounterByGroupGfx11[] = { @@ -3014,7 +3014,6 @@ namespace counter_oglp_gfx11 const std::set kHwOglpTimestampBlockIdsGfx11 = {888}; ///< Timestamp block id's for OGLP for gfx11 family const std::set kHwOglpTimeCounterIndicesGfx11 = {235773, 235774, 235775, 235776, 235777, 235778}; ///< Timestamp counter indices for OGLP for gfx11 family const unsigned int kHwOglpGroupCountGfx11 = static_cast(kHwOglpGroupsGfx11.size()); - const unsigned int kHwOglpExposedCountersGroupCountGfx11 = 760; const unsigned int kOglpPaddedCounterGroupCountGfx11 = 0; const unsigned int kHwOglpSqGroupCountGfx11 = sizeof(kHwOglpSqGroupsGfx11) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwOglpSqIsolatedGroupCountGfx11 = sizeof(kHwOglpSqIsolatedGroupsGfx11) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.h index e9d143fc..4c2bb800 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx11.h @@ -35,7 +35,6 @@ namespace counter_oglp_gfx11 extern const std::set kHwOglpTimestampBlockIdsGfx11; ///< Timestamp block id's for Oglp for Gfx11 family extern const std::set kHwOglpTimeCounterIndicesGfx11; ///< Timestamp counter indices for Oglp for Gfx11 family extern const unsigned int kHwOglpGroupCountGfx11; ///< Hardware Group Count for Oglp for Gfx11 family - extern const unsigned int kHwOglpExposedCountersGroupCountGfx11; ///< Exposed hardware counter Group Count for Oglp for Gfx11 family extern const unsigned int kOglpPaddedCounterGroupCountGfx11; ///< reserved counter group count for Oglp for Gfx11 family extern const unsigned int kHwOglpSqGroupCountGfx11; ///< Hardware SQ Group Count for Oglp for Gfx11 family extern const unsigned int kHwOglpSqIsolatedGroupCountGfx11; ///< Hardware Isolated Group Count for Oglp for Gfx11 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.cc index 1c5cdff1..fa3f5c02 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.cc @@ -599,236 +599,236 @@ namespace counter_oglp_gfx8 }; GpaCounterGroupExposedCounterDesc kHwOglpExposedCountersByGroupGfx8[] = { - {3, 67, {1, 9, 20, 96, 105, 124}}, - {4, 214, {1, 9, 20, 96, 105, 124}}, - {5, 361, {1, 9, 20, 96, 105, 124}}, - {6, 508, {1, 9, 20, 96, 105, 124}}, - {7, 655, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 808, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 961, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1114, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 1267, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {12, 1664, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {13, 2061, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {14, 2458, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {15, 2855, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {16, 3052, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {17, 3249, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {18, 3446, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {19, 3643, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {20, 3942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {21, 4241, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {22, 4540, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {23, 4839, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {24, 5138, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {25, 5437, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {26, 5736, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {27, 6035, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {28, 6334, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {29, 6633, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {30, 6932, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {31, 7231, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {32, 7530, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {33, 7829, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {34, 8128, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {35, 8427, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {36, 8726, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {37, 9025, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {38, 9324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {39, 9623, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {40, 9922, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {41, 10221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {42, 10520, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {43, 10819, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {44, 11118, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {45, 11417, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {46, 11716, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {47, 12015, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {48, 12314, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {49, 12613, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {50, 12912, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {51, 13211, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 13245, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 13279, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 13313, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 13347, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 13466, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 13585, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 13704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 13823, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 13942, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 14061, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 14180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 14299, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 14418, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 14537, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 14656, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 14775, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 14894, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 15013, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 15132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 15251, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 15370, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 15489, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 15608, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 15727, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 15846, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 15965, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 16084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 16203, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 16322, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 16441, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 16560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 16679, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 16798, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 16917, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 17036, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 17155, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 17274, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 17393, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 17512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 17631, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 17750, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 17869, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 17988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 18107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 18226, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 18345, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 18464, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 18583, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 18702, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 18821, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 18940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 19059, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 19178, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 19297, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 19416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 19535, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 19654, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 19773, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 19892, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 20011, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 20130, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 20249, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 20368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 20487, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 20606, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 20725, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 20844, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 24483, {3, 7, 8, 9}}, - {184, 24663, {3, 7, 8, 9}}, - {185, 24843, {3, 7, 8, 9}}, - {186, 25023, {3, 7, 8, 9}}, - {187, 25203, {3, 7, 8, 9}}, - {188, 25383, {3, 7, 8, 9}}, - {189, 25563, {3, 7, 8, 9}}, - {190, 25743, {3, 7, 8, 9}}, - {191, 25923, {3, 7, 8, 9}}, - {192, 26103, {3, 7, 8, 9}}, - {193, 26283, {3, 7, 8, 9}}, - {194, 26463, {3, 7, 8, 9}}, - {195, 26643, {3, 7, 8, 9}}, - {196, 26823, {3, 7, 8, 9}}, - {197, 27003, {3, 7, 8, 9}}, - {198, 27183, {3, 7, 8, 9}}, - {199, 27363, {3, 7, 8, 9}}, - {200, 27543, {3, 7, 8, 9}}, - {201, 27723, {3, 7, 8, 9}}, - {202, 27903, {3, 7, 8, 9}}, - {203, 28083, {3, 7, 8, 9}}, - {204, 28263, {3, 7, 8, 9}}, - {205, 28443, {3, 7, 8, 9}}, - {206, 28623, {3, 7, 8, 9}}, - {207, 28803, {3, 7, 8, 9}}, - {208, 28983, {3, 7, 8, 9}}, - {209, 29163, {3, 7, 8, 9}}, - {210, 29343, {3, 7, 8, 9}}, - {211, 29523, {3, 7, 8, 9}}, - {212, 29703, {3, 7, 8, 9}}, - {213, 29883, {3, 7, 8, 9}}, - {214, 30063, {3, 7, 8, 9}}, - {215, 30243, {3, 7, 8, 9}}, - {216, 30423, {3, 7, 8, 9}}, - {217, 30603, {3, 7, 8, 9}}, - {218, 30783, {3, 7, 8, 9}}, - {219, 30963, {3, 7, 8, 9}}, - {220, 31143, {3, 7, 8, 9}}, - {221, 31323, {3, 7, 8, 9}}, - {222, 31503, {3, 7, 8, 9}}, - {223, 31683, {3, 7, 8, 9}}, - {224, 31863, {3, 7, 8, 9}}, - {225, 32043, {3, 7, 8, 9}}, - {226, 32223, {3, 7, 8, 9}}, - {227, 32403, {3, 7, 8, 9}}, - {228, 32583, {3, 7, 8, 9}}, - {229, 32763, {3, 7, 8, 9}}, - {230, 32943, {3, 7, 8, 9}}, - {231, 33123, {3, 7, 8, 9}}, - {232, 33303, {3, 7, 8, 9}}, - {233, 33483, {3, 7, 8, 9}}, - {234, 33663, {3, 7, 8, 9}}, - {235, 33843, {3, 7, 8, 9}}, - {236, 34023, {3, 7, 8, 9}}, - {237, 34203, {3, 7, 8, 9}}, - {238, 34383, {3, 7, 8, 9}}, - {239, 34563, {3, 7, 8, 9}}, - {240, 34743, {3, 7, 8, 9}}, - {241, 34923, {3, 7, 8, 9}}, - {242, 35103, {3, 7, 8, 9}}, - {243, 35283, {3, 7, 8, 9}}, - {244, 35463, {3, 7, 8, 9}}, - {245, 35643, {3, 7, 8, 9}}, - {246, 35823, {3, 7, 8, 9}}, - {247, 36003, {18, 19, 26, 28, 35}}, - {248, 36195, {18, 19, 26, 28, 35}}, - {249, 36387, {18, 19, 26, 28, 35}}, - {250, 36579, {18, 19, 26, 28, 35}}, - {251, 36771, {18, 19, 26, 28, 35}}, - {252, 36963, {18, 19, 26, 28, 35}}, - {253, 37155, {18, 19, 26, 28, 35}}, - {254, 37347, {18, 19, 26, 28, 35}}, - {255, 37539, {18, 19, 26, 28, 35}}, - {256, 37731, {18, 19, 26, 28, 35}}, - {257, 37923, {18, 19, 26, 28, 35}}, - {258, 38115, {18, 19, 26, 28, 35}}, - {259, 38307, {18, 19, 26, 28, 35}}, - {260, 38499, {18, 19, 26, 28, 35}}, - {261, 38691, {18, 19, 26, 28, 35}}, - {262, 38883, {18, 19, 26, 28, 35}}, - {265, 39145, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39402, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39659, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39916, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40173, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40430, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40687, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 40944, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41201, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41458, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 41715, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 41972, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42229, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 42486, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 42743, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43000, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 43257, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 43653, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 44049, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 44445, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 44841, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 45237, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 45633, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 46029, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 46425, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 46821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 47217, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 47613, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 48009, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 48405, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 48801, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 49197, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {299, 49741, {0, 2}}, - {343, 51136, {0, 1, 2, 3, 4, 5}}, + {3, 67}, + {4, 214}, + {5, 361}, + {6, 508}, + {7, 655}, + {8, 808}, + {9, 961}, + {10, 1114}, + {11, 1267}, + {12, 1664}, + {13, 2061}, + {14, 2458}, + {15, 2855}, + {16, 3052}, + {17, 3249}, + {18, 3446}, + {19, 3643}, + {20, 3942}, + {21, 4241}, + {22, 4540}, + {23, 4839}, + {24, 5138}, + {25, 5437}, + {26, 5736}, + {27, 6035}, + {28, 6334}, + {29, 6633}, + {30, 6932}, + {31, 7231}, + {32, 7530}, + {33, 7829}, + {34, 8128}, + {35, 8427}, + {36, 8726}, + {37, 9025}, + {38, 9324}, + {39, 9623}, + {40, 9922}, + {41, 10221}, + {42, 10520}, + {43, 10819}, + {44, 11118}, + {45, 11417}, + {46, 11716}, + {47, 12015}, + {48, 12314}, + {49, 12613}, + {50, 12912}, + {51, 13211}, + {52, 13245}, + {53, 13279}, + {54, 13313}, + {55, 13347}, + {56, 13466}, + {57, 13585}, + {58, 13704}, + {59, 13823}, + {60, 13942}, + {61, 14061}, + {62, 14180}, + {63, 14299}, + {64, 14418}, + {65, 14537}, + {66, 14656}, + {67, 14775}, + {68, 14894}, + {69, 15013}, + {70, 15132}, + {71, 15251}, + {72, 15370}, + {73, 15489}, + {74, 15608}, + {75, 15727}, + {76, 15846}, + {77, 15965}, + {78, 16084}, + {79, 16203}, + {80, 16322}, + {81, 16441}, + {82, 16560}, + {83, 16679}, + {84, 16798}, + {85, 16917}, + {86, 17036}, + {87, 17155}, + {88, 17274}, + {89, 17393}, + {90, 17512}, + {91, 17631}, + {92, 17750}, + {93, 17869}, + {94, 17988}, + {95, 18107}, + {96, 18226}, + {97, 18345}, + {98, 18464}, + {99, 18583}, + {100, 18702}, + {101, 18821}, + {102, 18940}, + {103, 19059}, + {104, 19178}, + {105, 19297}, + {106, 19416}, + {107, 19535}, + {108, 19654}, + {109, 19773}, + {110, 19892}, + {111, 20011}, + {112, 20130}, + {113, 20249}, + {114, 20368}, + {115, 20487}, + {116, 20606}, + {117, 20725}, + {118, 20844}, + {183, 24483}, + {184, 24663}, + {185, 24843}, + {186, 25023}, + {187, 25203}, + {188, 25383}, + {189, 25563}, + {190, 25743}, + {191, 25923}, + {192, 26103}, + {193, 26283}, + {194, 26463}, + {195, 26643}, + {196, 26823}, + {197, 27003}, + {198, 27183}, + {199, 27363}, + {200, 27543}, + {201, 27723}, + {202, 27903}, + {203, 28083}, + {204, 28263}, + {205, 28443}, + {206, 28623}, + {207, 28803}, + {208, 28983}, + {209, 29163}, + {210, 29343}, + {211, 29523}, + {212, 29703}, + {213, 29883}, + {214, 30063}, + {215, 30243}, + {216, 30423}, + {217, 30603}, + {218, 30783}, + {219, 30963}, + {220, 31143}, + {221, 31323}, + {222, 31503}, + {223, 31683}, + {224, 31863}, + {225, 32043}, + {226, 32223}, + {227, 32403}, + {228, 32583}, + {229, 32763}, + {230, 32943}, + {231, 33123}, + {232, 33303}, + {233, 33483}, + {234, 33663}, + {235, 33843}, + {236, 34023}, + {237, 34203}, + {238, 34383}, + {239, 34563}, + {240, 34743}, + {241, 34923}, + {242, 35103}, + {243, 35283}, + {244, 35463}, + {245, 35643}, + {246, 35823}, + {247, 36003}, + {248, 36195}, + {249, 36387}, + {250, 36579}, + {251, 36771}, + {252, 36963}, + {253, 37155}, + {254, 37347}, + {255, 37539}, + {256, 37731}, + {257, 37923}, + {258, 38115}, + {259, 38307}, + {260, 38499}, + {261, 38691}, + {262, 38883}, + {265, 39145}, + {266, 39402}, + {267, 39659}, + {268, 39916}, + {269, 40173}, + {270, 40430}, + {271, 40687}, + {272, 40944}, + {273, 41201}, + {274, 41458}, + {275, 41715}, + {276, 41972}, + {277, 42229}, + {278, 42486}, + {279, 42743}, + {280, 43000}, + {281, 43257}, + {282, 43653}, + {283, 44049}, + {284, 44445}, + {285, 44841}, + {286, 45237}, + {287, 45633}, + {288, 46029}, + {289, 46425}, + {290, 46821}, + {291, 47217}, + {292, 47613}, + {293, 48009}, + {294, 48405}, + {295, 48801}, + {296, 49197}, + {299, 49741}, + {343, 51136}, }; GpaPaddedCounterDesc kOglpPaddedCounterByGroupGfx8[] = { @@ -1093,7 +1093,6 @@ namespace counter_oglp_gfx8 const std::set kHwOglpTimestampBlockIdsGfx8 = {343}; ///< Timestamp block id's for OGLP for gfx8 family const std::set kHwOglpTimeCounterIndicesGfx8 = {51136, 51137, 51138, 51139, 51140, 51141}; ///< Timestamp counter indices for OGLP for gfx8 family const unsigned int kHwOglpGroupCountGfx8 = static_cast(kHwOglpGroupsGfx8.size()); - const unsigned int kHwOglpExposedCountersGroupCountGfx8 = 230; const unsigned int kOglpPaddedCounterGroupCountGfx8 = 0; const unsigned int kHwOglpSqGroupCountGfx8 = sizeof(kHwOglpSqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwOglpSqIsolatedGroupCountGfx8 = sizeof(kHwOglpSqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.h index ff03e371..bdd053ed 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx8.h @@ -35,7 +35,6 @@ namespace counter_oglp_gfx8 extern const std::set kHwOglpTimestampBlockIdsGfx8; ///< Timestamp block id's for Oglp for Gfx8 family extern const std::set kHwOglpTimeCounterIndicesGfx8; ///< Timestamp counter indices for Oglp for Gfx8 family extern const unsigned int kHwOglpGroupCountGfx8; ///< Hardware Group Count for Oglp for Gfx8 family - extern const unsigned int kHwOglpExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Oglp for Gfx8 family extern const unsigned int kOglpPaddedCounterGroupCountGfx8; ///< reserved counter group count for Oglp for Gfx8 family extern const unsigned int kHwOglpSqGroupCountGfx8; ///< Hardware SQ Group Count for Oglp for Gfx8 family extern const unsigned int kHwOglpSqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Oglp for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.cc index 109f2e60..f9cc2e7c 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.cc @@ -675,269 +675,269 @@ namespace counter_oglp_gfx9 }; GpaCounterGroupExposedCounterDesc kHwOglpExposedCountersByGroupGfx9[] = { - {0, 0, {0, 23}}, - {3, 96, {1, 9, 105, 114, 125, 146}}, - {4, 244, {1, 9, 105, 114, 125, 146}}, - {5, 392, {1, 9, 105, 114, 125, 146}}, - {6, 540, {1, 9, 105, 114, 125, 146}}, - {7, 688, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 1039, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 1390, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1741, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 2092, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 2584, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 3076, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 3568, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 4060, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {16, 4256, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {17, 4452, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {18, 4648, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {19, 4844, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {20, 5218, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {21, 5592, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {22, 5966, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {23, 6340, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {24, 6714, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {25, 7088, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {26, 7462, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {27, 7836, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {28, 8210, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {29, 8584, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {30, 8958, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {31, 9332, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {32, 9706, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {33, 10080, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {34, 10454, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {35, 10828, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {36, 11202, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {37, 11576, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {38, 11950, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {39, 12324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {40, 12698, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {41, 13072, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {42, 13446, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {43, 13820, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {44, 14194, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {45, 14568, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {46, 14942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {47, 15316, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {48, 15690, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {49, 16064, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {50, 16438, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {51, 16812, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 17020, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 17228, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 17436, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 17644, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 17763, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 17882, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 18001, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 18120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 18239, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 18358, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 18477, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 18596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 18715, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 18834, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 18953, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 19072, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 19191, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 19310, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 19429, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 19548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 19667, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 19786, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 19905, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 20024, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 20143, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 20262, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 20381, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 20500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 20619, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 20738, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 20857, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 20976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 21095, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 21214, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 21333, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 21452, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 21571, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 21690, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 21809, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 21928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 22047, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 22166, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 22285, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 22404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 22523, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 22642, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 22761, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 22880, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 22999, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 23118, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 23237, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 23356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 23475, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 23594, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 23713, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 23832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 23951, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 24070, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 24189, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 24308, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 24427, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 24546, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 24665, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 24903, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 25022, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 25141, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 28908, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {184, 28993, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {185, 29078, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {186, 29163, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {187, 29248, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {188, 29333, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {189, 29418, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {190, 29503, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {191, 29588, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {192, 29673, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {193, 29758, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {194, 29843, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {195, 29928, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {196, 30013, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {197, 30098, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {198, 30183, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {199, 30268, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {200, 30353, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {201, 30438, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {202, 30523, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {203, 30608, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {204, 30693, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {205, 30778, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {206, 30863, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {207, 30948, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {208, 31033, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {209, 31118, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {210, 31203, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {211, 31288, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {212, 31373, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {213, 31458, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {214, 31543, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {215, 31628, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {216, 31713, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {217, 31798, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {218, 31883, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {219, 31968, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {220, 32053, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {221, 32138, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {222, 32223, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {223, 32308, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {224, 32393, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {225, 32478, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {226, 32563, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {227, 32648, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {228, 32733, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {229, 32818, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {230, 32903, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {231, 32988, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {232, 33073, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {233, 33158, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {234, 33243, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {235, 33328, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {236, 33413, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {237, 33498, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {238, 33583, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {239, 33668, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {240, 33753, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {241, 33838, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {242, 33923, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {243, 34008, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {244, 34093, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {245, 34178, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {246, 34263, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {247, 34348, {20, 22, 29, 30, 33, 41, 42}}, - {248, 34630, {20, 22, 29, 30, 33, 41, 42}}, - {249, 34912, {20, 22, 29, 30, 33, 41, 42}}, - {250, 35194, {20, 22, 29, 30, 33, 41, 42}}, - {251, 35476, {20, 22, 29, 30, 33, 41, 42}}, - {252, 35758, {20, 22, 29, 30, 33, 41, 42}}, - {253, 36040, {20, 22, 29, 30, 33, 41, 42}}, - {254, 36322, {20, 22, 29, 30, 33, 41, 42}}, - {255, 36604, {20, 22, 29, 30, 33, 41, 42}}, - {256, 36886, {20, 22, 29, 30, 33, 41, 42}}, - {257, 37168, {20, 22, 29, 30, 33, 41, 42}}, - {258, 37450, {20, 22, 29, 30, 33, 41, 42}}, - {259, 37732, {20, 22, 29, 30, 33, 41, 42}}, - {260, 38014, {20, 22, 29, 30, 33, 41, 42}}, - {261, 38296, {20, 22, 29, 30, 33, 41, 42}}, - {262, 38578, {20, 22, 29, 30, 33, 41, 42}}, - {265, 38930, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39258, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39586, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39914, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40242, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40898, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 41226, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41554, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41882, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 42210, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 42538, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42866, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 43194, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 43522, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43850, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 44178, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 44622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 45066, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 45510, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 45954, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 46398, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 46842, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 47286, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 47730, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 48174, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 48618, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 49062, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 49506, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 49950, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 50394, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 50838, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {298, 51403, {0, 2}}, - {312, 51912, {55, 57}}, - {313, 51995, {55, 57}}, - {314, 52078, {55, 57}}, - {315, 52161, {55, 57}}, - {316, 52244, {55, 57}}, - {317, 52327, {55, 57}}, - {318, 52410, {55, 57}}, - {319, 52493, {55, 57}}, - {320, 52576, {55, 57}}, - {321, 52659, {55, 57}}, - {322, 52742, {55, 57}}, - {323, 52825, {55, 57}}, - {324, 52908, {55, 57}}, - {325, 52991, {55, 57}}, - {326, 53074, {55, 57}}, - {327, 53157, {55, 57}}, - {328, 53240, {55, 57}}, - {329, 53323, {55, 57}}, - {330, 53406, {55, 57}}, - {331, 53489, {55, 57}}, - {332, 53572, {55, 57}}, - {333, 53655, {55, 57}}, - {334, 53738, {55, 57}}, - {335, 53821, {55, 57}}, - {336, 53904, {55, 57}}, - {337, 53987, {55, 57}}, - {338, 54070, {55, 57}}, - {339, 54153, {55, 57}}, - {340, 54236, {55, 57}}, - {341, 54319, {55, 57}}, - {342, 54402, {55, 57}}, - {343, 54485, {55, 57}}, - {386, 58004, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {3, 96}, + {4, 244}, + {5, 392}, + {6, 540}, + {7, 688}, + {8, 1039}, + {9, 1390}, + {10, 1741}, + {11, 2092}, + {12, 2584}, + {13, 3076}, + {14, 3568}, + {15, 4060}, + {16, 4256}, + {17, 4452}, + {18, 4648}, + {19, 4844}, + {20, 5218}, + {21, 5592}, + {22, 5966}, + {23, 6340}, + {24, 6714}, + {25, 7088}, + {26, 7462}, + {27, 7836}, + {28, 8210}, + {29, 8584}, + {30, 8958}, + {31, 9332}, + {32, 9706}, + {33, 10080}, + {34, 10454}, + {35, 10828}, + {36, 11202}, + {37, 11576}, + {38, 11950}, + {39, 12324}, + {40, 12698}, + {41, 13072}, + {42, 13446}, + {43, 13820}, + {44, 14194}, + {45, 14568}, + {46, 14942}, + {47, 15316}, + {48, 15690}, + {49, 16064}, + {50, 16438}, + {51, 16812}, + {52, 17020}, + {53, 17228}, + {54, 17436}, + {55, 17644}, + {56, 17763}, + {57, 17882}, + {58, 18001}, + {59, 18120}, + {60, 18239}, + {61, 18358}, + {62, 18477}, + {63, 18596}, + {64, 18715}, + {65, 18834}, + {66, 18953}, + {67, 19072}, + {68, 19191}, + {69, 19310}, + {70, 19429}, + {71, 19548}, + {72, 19667}, + {73, 19786}, + {74, 19905}, + {75, 20024}, + {76, 20143}, + {77, 20262}, + {78, 20381}, + {79, 20500}, + {80, 20619}, + {81, 20738}, + {82, 20857}, + {83, 20976}, + {84, 21095}, + {85, 21214}, + {86, 21333}, + {87, 21452}, + {88, 21571}, + {89, 21690}, + {90, 21809}, + {91, 21928}, + {92, 22047}, + {93, 22166}, + {94, 22285}, + {95, 22404}, + {96, 22523}, + {97, 22642}, + {98, 22761}, + {99, 22880}, + {100, 22999}, + {101, 23118}, + {102, 23237}, + {103, 23356}, + {104, 23475}, + {105, 23594}, + {106, 23713}, + {107, 23832}, + {108, 23951}, + {109, 24070}, + {110, 24189}, + {111, 24308}, + {112, 24427}, + {113, 24546}, + {114, 24665}, + {115, 24784}, + {116, 24903}, + {117, 25022}, + {118, 25141}, + {183, 28908}, + {184, 28993}, + {185, 29078}, + {186, 29163}, + {187, 29248}, + {188, 29333}, + {189, 29418}, + {190, 29503}, + {191, 29588}, + {192, 29673}, + {193, 29758}, + {194, 29843}, + {195, 29928}, + {196, 30013}, + {197, 30098}, + {198, 30183}, + {199, 30268}, + {200, 30353}, + {201, 30438}, + {202, 30523}, + {203, 30608}, + {204, 30693}, + {205, 30778}, + {206, 30863}, + {207, 30948}, + {208, 31033}, + {209, 31118}, + {210, 31203}, + {211, 31288}, + {212, 31373}, + {213, 31458}, + {214, 31543}, + {215, 31628}, + {216, 31713}, + {217, 31798}, + {218, 31883}, + {219, 31968}, + {220, 32053}, + {221, 32138}, + {222, 32223}, + {223, 32308}, + {224, 32393}, + {225, 32478}, + {226, 32563}, + {227, 32648}, + {228, 32733}, + {229, 32818}, + {230, 32903}, + {231, 32988}, + {232, 33073}, + {233, 33158}, + {234, 33243}, + {235, 33328}, + {236, 33413}, + {237, 33498}, + {238, 33583}, + {239, 33668}, + {240, 33753}, + {241, 33838}, + {242, 33923}, + {243, 34008}, + {244, 34093}, + {245, 34178}, + {246, 34263}, + {247, 34348}, + {248, 34630}, + {249, 34912}, + {250, 35194}, + {251, 35476}, + {252, 35758}, + {253, 36040}, + {254, 36322}, + {255, 36604}, + {256, 36886}, + {257, 37168}, + {258, 37450}, + {259, 37732}, + {260, 38014}, + {261, 38296}, + {262, 38578}, + {265, 38930}, + {266, 39258}, + {267, 39586}, + {268, 39914}, + {269, 40242}, + {270, 40570}, + {271, 40898}, + {272, 41226}, + {273, 41554}, + {274, 41882}, + {275, 42210}, + {276, 42538}, + {277, 42866}, + {278, 43194}, + {279, 43522}, + {280, 43850}, + {281, 44178}, + {282, 44622}, + {283, 45066}, + {284, 45510}, + {285, 45954}, + {286, 46398}, + {287, 46842}, + {288, 47286}, + {289, 47730}, + {290, 48174}, + {291, 48618}, + {292, 49062}, + {293, 49506}, + {294, 49950}, + {295, 50394}, + {296, 50838}, + {298, 51403}, + {312, 51912}, + {313, 51995}, + {314, 52078}, + {315, 52161}, + {316, 52244}, + {317, 52327}, + {318, 52410}, + {319, 52493}, + {320, 52576}, + {321, 52659}, + {322, 52742}, + {323, 52825}, + {324, 52908}, + {325, 52991}, + {326, 53074}, + {327, 53157}, + {328, 53240}, + {329, 53323}, + {330, 53406}, + {331, 53489}, + {332, 53572}, + {333, 53655}, + {334, 53738}, + {335, 53821}, + {336, 53904}, + {337, 53987}, + {338, 54070}, + {339, 54153}, + {340, 54236}, + {341, 54319}, + {342, 54402}, + {343, 54485}, + {386, 58004}, }; GpaPaddedCounterDesc kOglpPaddedCounterByGroupGfx9[] = { @@ -1274,7 +1274,6 @@ namespace counter_oglp_gfx9 const std::set kHwOglpTimestampBlockIdsGfx9 = {386}; ///< Timestamp block id's for OGLP for gfx9 family const std::set kHwOglpTimeCounterIndicesGfx9 = {58004, 58005, 58006, 58007, 58008, 58009}; ///< Timestamp counter indices for OGLP for gfx9 family const unsigned int kHwOglpGroupCountGfx9 = static_cast(kHwOglpGroupsGfx9.size()); - const unsigned int kHwOglpExposedCountersGroupCountGfx9 = 263; const unsigned int kOglpPaddedCounterGroupCountGfx9 = 73; const unsigned int kHwOglpSqGroupCountGfx9 = sizeof(kHwOglpSqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwOglpSqIsolatedGroupCountGfx9 = sizeof(kHwOglpSqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.h index 8f58104e..cf3fa945 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_oglp_gfx9.h @@ -35,7 +35,6 @@ namespace counter_oglp_gfx9 extern const std::set kHwOglpTimestampBlockIdsGfx9; ///< Timestamp block id's for Oglp for Gfx9 family extern const std::set kHwOglpTimeCounterIndicesGfx9; ///< Timestamp counter indices for Oglp for Gfx9 family extern const unsigned int kHwOglpGroupCountGfx9; ///< Hardware Group Count for Oglp for Gfx9 family - extern const unsigned int kHwOglpExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Oglp for Gfx9 family extern const unsigned int kOglpPaddedCounterGroupCountGfx9; ///< reserved counter group count for Oglp for Gfx9 family extern const unsigned int kHwOglpSqGroupCountGfx9; ///< Hardware SQ Group Count for Oglp for Gfx9 family extern const unsigned int kHwOglpSqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Oglp for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk.cmake index ee7f19f7..89a99693 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(HW_COUNTER_HEADERS_VK diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.cc index 7c8fa799..78f2cdc4 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.cc @@ -566,212 +566,212 @@ namespace counter_vk_gfx10 }; GpaCounterGroupExposedCounterDesc kHwVkExposedCountersByGroupGfx10[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 306, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 572, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 838, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1104, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1656, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2208, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2760, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3312, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 3864, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4416, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 4968, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5520, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {14, 5849, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {15, 6178, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {16, 6690, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {17, 7202, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {18, 7714, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {19, 8226, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {20, 8738, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {21, 9250, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {22, 9762, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {23, 10274, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {24, 10786, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {25, 11298, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 11810, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12322, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 12834, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13346, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 13858, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14370, {12, 14, 17, 19, 22, 24, 27, 29}}, - {32, 14595, {12, 14, 17, 19, 22, 24, 27, 29}}, - {33, 14820, {12, 14, 17, 19, 22, 24, 27, 29}}, - {34, 15045, {12, 14, 17, 19, 22, 24, 27, 29}}, - {35, 15270, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {36, 15496, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {37, 15722, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {38, 15948, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {39, 16174, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {40, 16400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {41, 16626, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {42, 16852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {43, 17078, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {44, 17304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {45, 17530, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {46, 17756, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {47, 17982, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {48, 18208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {49, 18434, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {50, 18660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {51, 18886, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {52, 19112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {53, 19338, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {54, 19564, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {55, 19790, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 20016, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 20242, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 20468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 20694, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 20920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 21146, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 21372, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 21598, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 21824, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 22050, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 22276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 22502, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 22728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 22954, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 23180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 23406, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 23632, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 23858, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 24084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 26750, {9, 18, 36, 44, 45, 46}}, - {116, 26827, {9, 18, 36, 44, 45, 46}}, - {117, 26904, {9, 18, 36, 44, 45, 46}}, - {118, 26981, {9, 18, 36, 44, 45, 46}}, - {119, 27058, {9, 18, 36, 44, 45, 46}}, - {120, 27135, {9, 18, 36, 44, 45, 46}}, - {121, 27212, {9, 18, 36, 44, 45, 46}}, - {122, 27289, {9, 18, 36, 44, 45, 46}}, - {123, 27366, {9, 18, 36, 44, 45, 46}}, - {124, 27443, {9, 18, 36, 44, 45, 46}}, - {125, 27520, {9, 18, 36, 44, 45, 46}}, - {126, 27597, {9, 18, 36, 44, 45, 46}}, - {127, 27674, {9, 18, 36, 44, 45, 46}}, - {128, 27751, {9, 18, 36, 44, 45, 46}}, - {129, 27828, {9, 18, 36, 44, 45, 46}}, - {130, 27905, {9, 18, 36, 44, 45, 46}}, - {131, 27982, {9, 18, 36, 44, 45, 46}}, - {132, 28059, {9, 18, 36, 44, 45, 46}}, - {133, 28136, {9, 18, 36, 44, 45, 46}}, - {134, 28213, {9, 18, 36, 44, 45, 46}}, - {135, 28290, {9, 18, 36, 44, 45, 46}}, - {136, 28367, {9, 18, 36, 44, 45, 46}}, - {137, 28444, {9, 18, 36, 44, 45, 46}}, - {138, 28521, {9, 18, 36, 44, 45, 46}}, - {139, 28598, {9, 18, 36, 44, 45, 46}}, - {140, 28675, {9, 18, 36, 44, 45, 46}}, - {141, 28752, {9, 18, 36, 44, 45, 46}}, - {142, 28829, {9, 18, 36, 44, 45, 46}}, - {143, 28906, {9, 18, 36, 44, 45, 46}}, - {144, 28983, {9, 18, 36, 44, 45, 46}}, - {145, 29060, {9, 18, 36, 44, 45, 46}}, - {146, 29137, {9, 18, 36, 44, 45, 46}}, - {147, 29214, {9, 18, 36, 44, 45, 46}}, - {148, 29291, {9, 18, 36, 44, 45, 46}}, - {149, 29368, {9, 18, 36, 44, 45, 46}}, - {150, 29445, {9, 18, 36, 44, 45, 46}}, - {151, 29522, {9, 18, 36, 44, 45, 46}}, - {152, 29599, {9, 18, 36, 44, 45, 46}}, - {153, 29676, {9, 18, 36, 44, 45, 46}}, - {154, 29753, {9, 18, 36, 44, 45, 46}}, - {155, 29830, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {156, 30200, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {157, 30570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {158, 30940, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {159, 31310, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {160, 31680, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {161, 32050, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {162, 32420, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {163, 32790, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {164, 33160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {165, 33530, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {166, 33900, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {167, 34270, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {168, 34640, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {169, 35010, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {170, 35380, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {171, 35750, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {172, 36211, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {173, 36672, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {174, 37133, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {175, 37594, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {176, 38055, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {177, 38516, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {178, 38977, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {179, 39438, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {180, 39899, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {181, 40360, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {182, 40821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {183, 41282, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {184, 41743, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {185, 42204, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {186, 42665, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {188, 43249, {0, 2}}, - {199, 43729, {55, 57}}, - {200, 43818, {55, 57}}, - {201, 43907, {55, 57}}, - {202, 43996, {55, 57}}, - {203, 44085, {55, 57}}, - {204, 44174, {55, 57}}, - {205, 44263, {55, 57}}, - {206, 44352, {55, 57}}, - {207, 44441, {55, 57}}, - {208, 44530, {55, 57}}, - {209, 44619, {55, 57}}, - {210, 44708, {55, 57}}, - {211, 44797, {55, 57}}, - {212, 44886, {55, 57}}, - {213, 44975, {55, 57}}, - {214, 45064, {55, 57}}, - {252, 50144, {211, 221, 227, 247, 275}}, - {261, 50747, {14, 18}}, - {262, 50811, {14, 18}}, - {263, 50875, {14, 18}}, - {264, 50939, {14, 18}}, - {265, 51003, {14, 18}}, - {266, 51067, {14, 18}}, - {267, 51131, {14, 18}}, - {268, 51195, {14, 18}}, - {269, 51259, {14, 18}}, - {270, 51323, {14, 18}}, - {271, 51387, {14, 18}}, - {272, 51451, {14, 18}}, - {273, 51515, {14, 18}}, - {274, 51579, {14, 18}}, - {275, 51643, {14, 18}}, - {276, 51707, {14, 18}}, - {297, 52743, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {298, 52978, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {299, 53213, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {300, 53448, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {301, 53683, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {302, 53918, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {303, 54153, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {304, 54388, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {305, 54623, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {306, 54858, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {307, 55093, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {308, 55328, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {309, 55563, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {310, 55798, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {311, 56033, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {312, 56268, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {313, 56503, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {314, 56738, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {315, 56973, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {316, 57208, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {317, 57443, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {318, 57678, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {319, 57913, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {320, 58148, {3, 35, 75, 76, 79, 89, 90, 91, 92}}, - {334, 59893, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 306}, + {3, 572}, + {4, 838}, + {5, 1104}, + {6, 1656}, + {7, 2208}, + {8, 2760}, + {9, 3312}, + {10, 3864}, + {11, 4416}, + {12, 4968}, + {13, 5520}, + {14, 5849}, + {15, 6178}, + {16, 6690}, + {17, 7202}, + {18, 7714}, + {19, 8226}, + {20, 8738}, + {21, 9250}, + {22, 9762}, + {23, 10274}, + {24, 10786}, + {25, 11298}, + {26, 11810}, + {27, 12322}, + {28, 12834}, + {29, 13346}, + {30, 13858}, + {31, 14370}, + {32, 14595}, + {33, 14820}, + {34, 15045}, + {35, 15270}, + {36, 15496}, + {37, 15722}, + {38, 15948}, + {39, 16174}, + {40, 16400}, + {41, 16626}, + {42, 16852}, + {43, 17078}, + {44, 17304}, + {45, 17530}, + {46, 17756}, + {47, 17982}, + {48, 18208}, + {49, 18434}, + {50, 18660}, + {51, 18886}, + {52, 19112}, + {53, 19338}, + {54, 19564}, + {55, 19790}, + {56, 20016}, + {57, 20242}, + {58, 20468}, + {59, 20694}, + {60, 20920}, + {61, 21146}, + {62, 21372}, + {63, 21598}, + {64, 21824}, + {65, 22050}, + {66, 22276}, + {67, 22502}, + {68, 22728}, + {69, 22954}, + {70, 23180}, + {71, 23406}, + {72, 23632}, + {73, 23858}, + {74, 24084}, + {115, 26750}, + {116, 26827}, + {117, 26904}, + {118, 26981}, + {119, 27058}, + {120, 27135}, + {121, 27212}, + {122, 27289}, + {123, 27366}, + {124, 27443}, + {125, 27520}, + {126, 27597}, + {127, 27674}, + {128, 27751}, + {129, 27828}, + {130, 27905}, + {131, 27982}, + {132, 28059}, + {133, 28136}, + {134, 28213}, + {135, 28290}, + {136, 28367}, + {137, 28444}, + {138, 28521}, + {139, 28598}, + {140, 28675}, + {141, 28752}, + {142, 28829}, + {143, 28906}, + {144, 28983}, + {145, 29060}, + {146, 29137}, + {147, 29214}, + {148, 29291}, + {149, 29368}, + {150, 29445}, + {151, 29522}, + {152, 29599}, + {153, 29676}, + {154, 29753}, + {155, 29830}, + {156, 30200}, + {157, 30570}, + {158, 30940}, + {159, 31310}, + {160, 31680}, + {161, 32050}, + {162, 32420}, + {163, 32790}, + {164, 33160}, + {165, 33530}, + {166, 33900}, + {167, 34270}, + {168, 34640}, + {169, 35010}, + {170, 35380}, + {171, 35750}, + {172, 36211}, + {173, 36672}, + {174, 37133}, + {175, 37594}, + {176, 38055}, + {177, 38516}, + {178, 38977}, + {179, 39438}, + {180, 39899}, + {181, 40360}, + {182, 40821}, + {183, 41282}, + {184, 41743}, + {185, 42204}, + {186, 42665}, + {188, 43249}, + {199, 43729}, + {200, 43818}, + {201, 43907}, + {202, 43996}, + {203, 44085}, + {204, 44174}, + {205, 44263}, + {206, 44352}, + {207, 44441}, + {208, 44530}, + {209, 44619}, + {210, 44708}, + {211, 44797}, + {212, 44886}, + {213, 44975}, + {214, 45064}, + {252, 50144}, + {261, 50747}, + {262, 50811}, + {263, 50875}, + {264, 50939}, + {265, 51003}, + {266, 51067}, + {267, 51131}, + {268, 51195}, + {269, 51259}, + {270, 51323}, + {271, 51387}, + {272, 51451}, + {273, 51515}, + {274, 51579}, + {275, 51643}, + {276, 51707}, + {297, 52743}, + {298, 52978}, + {299, 53213}, + {300, 53448}, + {301, 53683}, + {302, 53918}, + {303, 54153}, + {304, 54388}, + {305, 54623}, + {306, 54858}, + {307, 55093}, + {308, 55328}, + {309, 55563}, + {310, 55798}, + {311, 56033}, + {312, 56268}, + {313, 56503}, + {314, 56738}, + {315, 56973}, + {316, 57208}, + {317, 57443}, + {318, 57678}, + {319, 57913}, + {320, 58148}, + {334, 59893}, }; GpaPaddedCounterDesc kVkPaddedCounterByGroupGfx10[] = { @@ -1268,7 +1268,6 @@ namespace counter_vk_gfx10 const std::set kHwVkTimestampBlockIdsGfx10 = {334}; ///< Timestamp block id's for VK for gfx10 family const std::set kHwVkTimeCounterIndicesGfx10 = {59893, 59894, 59895, 59896, 59897, 59898}; ///< Timestamp counter indices for VK for gfx10 family const unsigned int kHwVkGroupCountGfx10 = static_cast(kHwVkGroupsGfx10.size()); - const unsigned int kHwVkExposedCountersGroupCountGfx10 = 206; const unsigned int kVkPaddedCounterGroupCountGfx10 = 0; const unsigned int kHwVkSqGroupCountGfx10 = sizeof(kHwVkSqGroupsGfx10) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwVkSqIsolatedGroupCountGfx10 = sizeof(kHwVkSqIsolatedGroupsGfx10) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.h index 507895e3..6fbe23c5 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx10.h @@ -39,7 +39,6 @@ namespace counter_vk_gfx10 extern const std::set kHwVkTimestampBlockIdsGfx10; ///< Timestamp block id's for Vk for Gfx10 family extern const std::set kHwVkTimeCounterIndicesGfx10; ///< Timestamp counter indices for Vk for Gfx10 family extern const unsigned int kHwVkGroupCountGfx10; ///< Hardware Group Count for Vk for Gfx10 family - extern const unsigned int kHwVkExposedCountersGroupCountGfx10; ///< Exposed hardware counter Group Count for Vk for Gfx10 family extern const unsigned int kVkPaddedCounterGroupCountGfx10; ///< reserved counter group count for Vk for Gfx10 family extern const unsigned int kHwVkSqGroupCountGfx10; ///< Hardware SQ Group Count for Vk for Gfx10 family extern const unsigned int kHwVkSqIsolatedGroupCountGfx10; ///< Hardware Isolated Group Count for Vk for Gfx10 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.cc index ab308f32..2e173110 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.cc @@ -969,414 +969,414 @@ namespace counter_vk_gfx103 }; GpaCounterGroupExposedCounterDesc kHwVkExposedCountersByGroupGfx103[] = { - {0, 0, {0, 24}}, - {1, 40, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 316, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 592, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 868, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1144, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {6, 1722, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {7, 2300, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {8, 2878, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {9, 3456, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {10, 4034, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {11, 4612, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 5190, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 5768, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 6346, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 6924, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {16, 7502, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {17, 8080, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {18, 8658, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {19, 9236, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {20, 9814, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {21, 10392, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {22, 10724, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {23, 11056, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {24, 11388, {1, 9, 18, 21, 34, 41, 45, 46, 49, 51, 52, 55, 60, 61, 62, 63, 80, 81, 82, 83, 308, 314, 320, 326}}, - {25, 11720, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {26, 12232, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {27, 12744, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {28, 13256, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {29, 13768, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {30, 14280, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {31, 14792, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {32, 15304, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {33, 15816, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {34, 16328, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {35, 16840, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {36, 17352, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {37, 17864, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {38, 18376, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {39, 18888, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {40, 19400, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {41, 19912, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {42, 20424, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {43, 20936, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {44, 21448, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {45, 21960, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {46, 22472, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {47, 22984, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {48, 23496, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {49, 24008, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {50, 24520, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {51, 25032, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {52, 25544, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {53, 26056, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {54, 26568, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {55, 27080, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {56, 27592, {4, 5, 8, 31, 55, 57, 59, 60, 61, 64, 69, 70, 82, 117, 285, 299, 300, 301, 302, 334, 335, 336, 337}}, - {57, 28104, {12, 14, 17, 19, 22, 24, 27, 29}}, - {58, 28329, {12, 14, 17, 19, 22, 24, 27, 29}}, - {59, 28554, {12, 14, 17, 19, 22, 24, 27, 29}}, - {60, 28779, {12, 14, 17, 19, 22, 24, 27, 29}}, - {61, 29004, {12, 14, 17, 19, 22, 24, 27, 29}}, - {62, 29229, {12, 14, 17, 19, 22, 24, 27, 29}}, - {63, 29454, {12, 14, 17, 19, 22, 24, 27, 29}}, - {64, 29679, {12, 14, 17, 19, 22, 24, 27, 29}}, - {65, 29904, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {66, 30140, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {67, 30376, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {68, 30612, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {69, 30848, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {70, 31084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {71, 31320, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {72, 31556, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {73, 31792, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {74, 32028, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {75, 32264, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {76, 32500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {77, 32736, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {78, 32972, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {79, 33208, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 33444, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 33680, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 33916, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 34152, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 34388, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 34624, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 34860, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 35096, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 35332, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 35568, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 35804, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 36040, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 36276, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 36512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 36748, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 36984, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 37220, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 37456, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 37692, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 37928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 38164, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 38400, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 38636, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 38872, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 39108, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 39344, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 39580, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 39816, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 40052, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 40288, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 40524, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 40760, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 40996, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 41232, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 41468, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 41704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 41940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 42176, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 42412, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 42648, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 42884, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 43120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 43356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 43592, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 43828, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 44064, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 44300, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 44536, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 44772, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 45008, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 45244, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 45480, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 45716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 45952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 46188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 46424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 46660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 46896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 47132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 47368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 47604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 47840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 48076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 48312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 48548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 48784, {82, 116, 117, 118}}, - {146, 48976, {82, 116, 117, 118}}, - {147, 49168, {82, 116, 117, 118}}, - {148, 49360, {82, 116, 117, 118}}, - {149, 49552, {82, 116, 117, 118}}, - {150, 49744, {82, 116, 117, 118}}, - {151, 49936, {82, 116, 117, 118}}, - {152, 50128, {82, 116, 117, 118}}, - {153, 50320, {82, 116, 117, 118}}, - {154, 50512, {82, 116, 117, 118}}, - {155, 50704, {82, 116, 117, 118}}, - {156, 50896, {82, 116, 117, 118}}, - {157, 51088, {82, 116, 117, 118}}, - {158, 51280, {82, 116, 117, 118}}, - {159, 51472, {82, 116, 117, 118}}, - {160, 51664, {82, 116, 117, 118}}, - {161, 51856, {82, 116, 117, 118}}, - {162, 52048, {82, 116, 117, 118}}, - {163, 52240, {82, 116, 117, 118}}, - {164, 52432, {82, 116, 117, 118}}, - {165, 52624, {82, 116, 117, 118}}, - {166, 52816, {82, 116, 117, 118}}, - {167, 53008, {82, 116, 117, 118}}, - {168, 53200, {82, 116, 117, 118}}, - {169, 53392, {82, 116, 117, 118}}, - {170, 53584, {82, 116, 117, 118}}, - {171, 53776, {82, 116, 117, 118}}, - {172, 53968, {82, 116, 117, 118}}, - {173, 54160, {82, 116, 117, 118}}, - {174, 54352, {82, 116, 117, 118}}, - {175, 54544, {82, 116, 117, 118}}, - {176, 54736, {82, 116, 117, 118}}, - {177, 54928, {82, 116, 117, 118}}, - {178, 55120, {82, 116, 117, 118}}, - {179, 55312, {82, 116, 117, 118}}, - {180, 55504, {82, 116, 117, 118}}, - {181, 55696, {82, 116, 117, 118}}, - {182, 55888, {82, 116, 117, 118}}, - {183, 56080, {82, 116, 117, 118}}, - {184, 56272, {82, 116, 117, 118}}, - {185, 56464, {82, 116, 117, 118}}, - {186, 56656, {82, 116, 117, 118}}, - {187, 56848, {82, 116, 117, 118}}, - {188, 57040, {82, 116, 117, 118}}, - {189, 57232, {82, 116, 117, 118}}, - {190, 57424, {82, 116, 117, 118}}, - {191, 57616, {82, 116, 117, 118}}, - {192, 57808, {82, 116, 117, 118}}, - {193, 58000, {82, 116, 117, 118}}, - {194, 58192, {82, 116, 117, 118}}, - {195, 58384, {82, 116, 117, 118}}, - {196, 58576, {82, 116, 117, 118}}, - {197, 58768, {82, 116, 117, 118}}, - {198, 58960, {82, 116, 117, 118}}, - {199, 59152, {82, 116, 117, 118}}, - {200, 59344, {82, 116, 117, 118}}, - {201, 59536, {82, 116, 117, 118}}, - {202, 59728, {82, 116, 117, 118}}, - {203, 59920, {82, 116, 117, 118}}, - {204, 60112, {82, 116, 117, 118}}, - {205, 60304, {82, 116, 117, 118}}, - {206, 60496, {82, 116, 117, 118}}, - {207, 60688, {82, 116, 117, 118}}, - {208, 60880, {82, 116, 117, 118}}, - {209, 61072, {82, 116, 117, 118}}, - {210, 61264, {82, 116, 117, 118}}, - {211, 61456, {82, 116, 117, 118}}, - {212, 61648, {82, 116, 117, 118}}, - {213, 61840, {82, 116, 117, 118}}, - {214, 62032, {82, 116, 117, 118}}, - {215, 62224, {82, 116, 117, 118}}, - {216, 62416, {82, 116, 117, 118}}, - {217, 62608, {82, 116, 117, 118}}, - {218, 62800, {82, 116, 117, 118}}, - {219, 62992, {82, 116, 117, 118}}, - {220, 63184, {82, 116, 117, 118}}, - {221, 63376, {82, 116, 117, 118}}, - {222, 63568, {82, 116, 117, 118}}, - {223, 63760, {82, 116, 117, 118}}, - {224, 63952, {82, 116, 117, 118}}, - {225, 64144, {9, 18, 36, 43, 44, 45}}, - {226, 64205, {9, 18, 36, 43, 44, 45}}, - {227, 64266, {9, 18, 36, 43, 44, 45}}, - {228, 64327, {9, 18, 36, 43, 44, 45}}, - {229, 64388, {9, 18, 36, 43, 44, 45}}, - {230, 64449, {9, 18, 36, 43, 44, 45}}, - {231, 64510, {9, 18, 36, 43, 44, 45}}, - {232, 64571, {9, 18, 36, 43, 44, 45}}, - {233, 64632, {9, 18, 36, 43, 44, 45}}, - {234, 64693, {9, 18, 36, 43, 44, 45}}, - {235, 64754, {9, 18, 36, 43, 44, 45}}, - {236, 64815, {9, 18, 36, 43, 44, 45}}, - {237, 64876, {9, 18, 36, 43, 44, 45}}, - {238, 64937, {9, 18, 36, 43, 44, 45}}, - {239, 64998, {9, 18, 36, 43, 44, 45}}, - {240, 65059, {9, 18, 36, 43, 44, 45}}, - {241, 65120, {9, 18, 36, 43, 44, 45}}, - {242, 65181, {9, 18, 36, 43, 44, 45}}, - {243, 65242, {9, 18, 36, 43, 44, 45}}, - {244, 65303, {9, 18, 36, 43, 44, 45}}, - {245, 65364, {9, 18, 36, 43, 44, 45}}, - {246, 65425, {9, 18, 36, 43, 44, 45}}, - {247, 65486, {9, 18, 36, 43, 44, 45}}, - {248, 65547, {9, 18, 36, 43, 44, 45}}, - {249, 65608, {9, 18, 36, 43, 44, 45}}, - {250, 65669, {9, 18, 36, 43, 44, 45}}, - {251, 65730, {9, 18, 36, 43, 44, 45}}, - {252, 65791, {9, 18, 36, 43, 44, 45}}, - {253, 65852, {9, 18, 36, 43, 44, 45}}, - {254, 65913, {9, 18, 36, 43, 44, 45}}, - {255, 65974, {9, 18, 36, 43, 44, 45}}, - {256, 66035, {9, 18, 36, 43, 44, 45}}, - {257, 66096, {9, 18, 36, 43, 44, 45}}, - {258, 66157, {9, 18, 36, 43, 44, 45}}, - {259, 66218, {9, 18, 36, 43, 44, 45}}, - {260, 66279, {9, 18, 36, 43, 44, 45}}, - {261, 66340, {9, 18, 36, 43, 44, 45}}, - {262, 66401, {9, 18, 36, 43, 44, 45}}, - {263, 66462, {9, 18, 36, 43, 44, 45}}, - {264, 66523, {9, 18, 36, 43, 44, 45}}, - {265, 66584, {9, 18, 36, 43, 44, 45}}, - {266, 66645, {9, 18, 36, 43, 44, 45}}, - {267, 66706, {9, 18, 36, 43, 44, 45}}, - {268, 66767, {9, 18, 36, 43, 44, 45}}, - {269, 66828, {9, 18, 36, 43, 44, 45}}, - {270, 66889, {9, 18, 36, 43, 44, 45}}, - {271, 66950, {9, 18, 36, 43, 44, 45}}, - {272, 67011, {9, 18, 36, 43, 44, 45}}, - {273, 67072, {9, 18, 36, 43, 44, 45}}, - {274, 67133, {9, 18, 36, 43, 44, 45}}, - {275, 67194, {9, 18, 36, 43, 44, 45}}, - {276, 67255, {9, 18, 36, 43, 44, 45}}, - {277, 67316, {9, 18, 36, 43, 44, 45}}, - {278, 67377, {9, 18, 36, 43, 44, 45}}, - {279, 67438, {9, 18, 36, 43, 44, 45}}, - {280, 67499, {9, 18, 36, 43, 44, 45}}, - {281, 67560, {9, 18, 36, 43, 44, 45}}, - {282, 67621, {9, 18, 36, 43, 44, 45}}, - {283, 67682, {9, 18, 36, 43, 44, 45}}, - {284, 67743, {9, 18, 36, 43, 44, 45}}, - {285, 67804, {9, 18, 36, 43, 44, 45}}, - {286, 67865, {9, 18, 36, 43, 44, 45}}, - {287, 67926, {9, 18, 36, 43, 44, 45}}, - {288, 67987, {9, 18, 36, 43, 44, 45}}, - {289, 68048, {9, 18, 36, 43, 44, 45}}, - {290, 68109, {9, 18, 36, 43, 44, 45}}, - {291, 68170, {9, 18, 36, 43, 44, 45}}, - {292, 68231, {9, 18, 36, 43, 44, 45}}, - {293, 68292, {9, 18, 36, 43, 44, 45}}, - {294, 68353, {9, 18, 36, 43, 44, 45}}, - {295, 68414, {9, 18, 36, 43, 44, 45}}, - {296, 68475, {9, 18, 36, 43, 44, 45}}, - {297, 68536, {9, 18, 36, 43, 44, 45}}, - {298, 68597, {9, 18, 36, 43, 44, 45}}, - {299, 68658, {9, 18, 36, 43, 44, 45}}, - {300, 68719, {9, 18, 36, 43, 44, 45}}, - {301, 68780, {9, 18, 36, 43, 44, 45}}, - {302, 68841, {9, 18, 36, 43, 44, 45}}, - {303, 68902, {9, 18, 36, 43, 44, 45}}, - {304, 68963, {9, 18, 36, 43, 44, 45}}, - {305, 69024, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {306, 69415, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {307, 69806, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {308, 70197, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {309, 70588, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {310, 70979, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {311, 71370, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {312, 71761, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {313, 72152, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {314, 72543, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {315, 72934, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {316, 73325, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {317, 73716, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {318, 74107, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {319, 74498, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {320, 74889, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {321, 75280, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {322, 75733, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {323, 76186, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {324, 76639, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {325, 77092, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {326, 77545, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {327, 77998, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {328, 78451, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {329, 78904, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {330, 79357, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {331, 79810, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {332, 80263, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {333, 80716, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {334, 81169, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {335, 81622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {336, 82075, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {338, 82649, {0, 2}}, - {351, 83291, {55, 57}}, - {352, 83381, {55, 57}}, - {353, 83471, {55, 57}}, - {354, 83561, {55, 57}}, - {355, 83651, {55, 57}}, - {356, 83741, {55, 57}}, - {357, 83831, {55, 57}}, - {358, 83921, {55, 57}}, - {359, 84011, {55, 57}}, - {360, 84101, {55, 57}}, - {361, 84191, {55, 57}}, - {362, 84281, {55, 57}}, - {363, 84371, {55, 57}}, - {364, 84461, {55, 57}}, - {365, 84551, {55, 57}}, - {366, 84641, {55, 57}}, - {429, 94083, {14, 18}}, - {430, 94166, {14, 18}}, - {431, 94249, {14, 18}}, - {432, 94332, {14, 18}}, - {433, 94415, {14, 18}}, - {434, 94498, {14, 18}}, - {435, 94581, {14, 18}}, - {436, 94664, {14, 18}}, - {437, 94747, {14, 18}}, - {438, 94830, {14, 18}}, - {439, 94913, {14, 18}}, - {440, 94996, {14, 18}}, - {441, 95079, {14, 18}}, - {442, 95162, {14, 18}}, - {443, 95245, {14, 18}}, - {444, 95328, {14, 18}}, - {445, 95411, {14, 18}}, - {446, 95494, {14, 18}}, - {447, 95577, {14, 18}}, - {448, 95660, {14, 18}}, - {449, 95743, {14, 18}}, - {450, 95826, {14, 18}}, - {451, 95909, {14, 18}}, - {452, 95992, {14, 18}}, - {453, 96075, {14, 18}}, - {454, 96158, {14, 18}}, - {455, 96241, {14, 18}}, - {456, 96324, {14, 18}}, - {457, 96407, {14, 18}}, - {458, 96490, {14, 18}}, - {459, 96573, {14, 18}}, - {460, 96656, {14, 18}}, - {497, 98319, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {498, 98573, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {499, 98827, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {500, 99081, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {501, 99335, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {502, 99589, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {503, 99843, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {504, 100097, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {505, 100351, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {506, 100605, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {507, 100859, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {508, 101113, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {509, 101367, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {510, 101621, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {511, 101875, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {512, 102129, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {530, 104101, {42}}, - {531, 104164, {4, 73, 80, 86, 111}}, - {532, 104303, {4, 73, 80, 86, 111}}, - {533, 104442, {4, 73, 80, 86, 111}}, - {534, 104581, {4, 73, 80, 86, 111}}, - {535, 104720, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 40}, + {2, 316}, + {3, 592}, + {4, 868}, + {5, 1144}, + {6, 1722}, + {7, 2300}, + {8, 2878}, + {9, 3456}, + {10, 4034}, + {11, 4612}, + {12, 5190}, + {13, 5768}, + {14, 6346}, + {15, 6924}, + {16, 7502}, + {17, 8080}, + {18, 8658}, + {19, 9236}, + {20, 9814}, + {21, 10392}, + {22, 10724}, + {23, 11056}, + {24, 11388}, + {25, 11720}, + {26, 12232}, + {27, 12744}, + {28, 13256}, + {29, 13768}, + {30, 14280}, + {31, 14792}, + {32, 15304}, + {33, 15816}, + {34, 16328}, + {35, 16840}, + {36, 17352}, + {37, 17864}, + {38, 18376}, + {39, 18888}, + {40, 19400}, + {41, 19912}, + {42, 20424}, + {43, 20936}, + {44, 21448}, + {45, 21960}, + {46, 22472}, + {47, 22984}, + {48, 23496}, + {49, 24008}, + {50, 24520}, + {51, 25032}, + {52, 25544}, + {53, 26056}, + {54, 26568}, + {55, 27080}, + {56, 27592}, + {57, 28104}, + {58, 28329}, + {59, 28554}, + {60, 28779}, + {61, 29004}, + {62, 29229}, + {63, 29454}, + {64, 29679}, + {65, 29904}, + {66, 30140}, + {67, 30376}, + {68, 30612}, + {69, 30848}, + {70, 31084}, + {71, 31320}, + {72, 31556}, + {73, 31792}, + {74, 32028}, + {75, 32264}, + {76, 32500}, + {77, 32736}, + {78, 32972}, + {79, 33208}, + {80, 33444}, + {81, 33680}, + {82, 33916}, + {83, 34152}, + {84, 34388}, + {85, 34624}, + {86, 34860}, + {87, 35096}, + {88, 35332}, + {89, 35568}, + {90, 35804}, + {91, 36040}, + {92, 36276}, + {93, 36512}, + {94, 36748}, + {95, 36984}, + {96, 37220}, + {97, 37456}, + {98, 37692}, + {99, 37928}, + {100, 38164}, + {101, 38400}, + {102, 38636}, + {103, 38872}, + {104, 39108}, + {105, 39344}, + {106, 39580}, + {107, 39816}, + {108, 40052}, + {109, 40288}, + {110, 40524}, + {111, 40760}, + {112, 40996}, + {113, 41232}, + {114, 41468}, + {115, 41704}, + {116, 41940}, + {117, 42176}, + {118, 42412}, + {119, 42648}, + {120, 42884}, + {121, 43120}, + {122, 43356}, + {123, 43592}, + {124, 43828}, + {125, 44064}, + {126, 44300}, + {127, 44536}, + {128, 44772}, + {129, 45008}, + {130, 45244}, + {131, 45480}, + {132, 45716}, + {133, 45952}, + {134, 46188}, + {135, 46424}, + {136, 46660}, + {137, 46896}, + {138, 47132}, + {139, 47368}, + {140, 47604}, + {141, 47840}, + {142, 48076}, + {143, 48312}, + {144, 48548}, + {145, 48784}, + {146, 48976}, + {147, 49168}, + {148, 49360}, + {149, 49552}, + {150, 49744}, + {151, 49936}, + {152, 50128}, + {153, 50320}, + {154, 50512}, + {155, 50704}, + {156, 50896}, + {157, 51088}, + {158, 51280}, + {159, 51472}, + {160, 51664}, + {161, 51856}, + {162, 52048}, + {163, 52240}, + {164, 52432}, + {165, 52624}, + {166, 52816}, + {167, 53008}, + {168, 53200}, + {169, 53392}, + {170, 53584}, + {171, 53776}, + {172, 53968}, + {173, 54160}, + {174, 54352}, + {175, 54544}, + {176, 54736}, + {177, 54928}, + {178, 55120}, + {179, 55312}, + {180, 55504}, + {181, 55696}, + {182, 55888}, + {183, 56080}, + {184, 56272}, + {185, 56464}, + {186, 56656}, + {187, 56848}, + {188, 57040}, + {189, 57232}, + {190, 57424}, + {191, 57616}, + {192, 57808}, + {193, 58000}, + {194, 58192}, + {195, 58384}, + {196, 58576}, + {197, 58768}, + {198, 58960}, + {199, 59152}, + {200, 59344}, + {201, 59536}, + {202, 59728}, + {203, 59920}, + {204, 60112}, + {205, 60304}, + {206, 60496}, + {207, 60688}, + {208, 60880}, + {209, 61072}, + {210, 61264}, + {211, 61456}, + {212, 61648}, + {213, 61840}, + {214, 62032}, + {215, 62224}, + {216, 62416}, + {217, 62608}, + {218, 62800}, + {219, 62992}, + {220, 63184}, + {221, 63376}, + {222, 63568}, + {223, 63760}, + {224, 63952}, + {225, 64144}, + {226, 64205}, + {227, 64266}, + {228, 64327}, + {229, 64388}, + {230, 64449}, + {231, 64510}, + {232, 64571}, + {233, 64632}, + {234, 64693}, + {235, 64754}, + {236, 64815}, + {237, 64876}, + {238, 64937}, + {239, 64998}, + {240, 65059}, + {241, 65120}, + {242, 65181}, + {243, 65242}, + {244, 65303}, + {245, 65364}, + {246, 65425}, + {247, 65486}, + {248, 65547}, + {249, 65608}, + {250, 65669}, + {251, 65730}, + {252, 65791}, + {253, 65852}, + {254, 65913}, + {255, 65974}, + {256, 66035}, + {257, 66096}, + {258, 66157}, + {259, 66218}, + {260, 66279}, + {261, 66340}, + {262, 66401}, + {263, 66462}, + {264, 66523}, + {265, 66584}, + {266, 66645}, + {267, 66706}, + {268, 66767}, + {269, 66828}, + {270, 66889}, + {271, 66950}, + {272, 67011}, + {273, 67072}, + {274, 67133}, + {275, 67194}, + {276, 67255}, + {277, 67316}, + {278, 67377}, + {279, 67438}, + {280, 67499}, + {281, 67560}, + {282, 67621}, + {283, 67682}, + {284, 67743}, + {285, 67804}, + {286, 67865}, + {287, 67926}, + {288, 67987}, + {289, 68048}, + {290, 68109}, + {291, 68170}, + {292, 68231}, + {293, 68292}, + {294, 68353}, + {295, 68414}, + {296, 68475}, + {297, 68536}, + {298, 68597}, + {299, 68658}, + {300, 68719}, + {301, 68780}, + {302, 68841}, + {303, 68902}, + {304, 68963}, + {305, 69024}, + {306, 69415}, + {307, 69806}, + {308, 70197}, + {309, 70588}, + {310, 70979}, + {311, 71370}, + {312, 71761}, + {313, 72152}, + {314, 72543}, + {315, 72934}, + {316, 73325}, + {317, 73716}, + {318, 74107}, + {319, 74498}, + {320, 74889}, + {321, 75280}, + {322, 75733}, + {323, 76186}, + {324, 76639}, + {325, 77092}, + {326, 77545}, + {327, 77998}, + {328, 78451}, + {329, 78904}, + {330, 79357}, + {331, 79810}, + {332, 80263}, + {333, 80716}, + {334, 81169}, + {335, 81622}, + {336, 82075}, + {338, 82649}, + {351, 83291}, + {352, 83381}, + {353, 83471}, + {354, 83561}, + {355, 83651}, + {356, 83741}, + {357, 83831}, + {358, 83921}, + {359, 84011}, + {360, 84101}, + {361, 84191}, + {362, 84281}, + {363, 84371}, + {364, 84461}, + {365, 84551}, + {366, 84641}, + {429, 94083}, + {430, 94166}, + {431, 94249}, + {432, 94332}, + {433, 94415}, + {434, 94498}, + {435, 94581}, + {436, 94664}, + {437, 94747}, + {438, 94830}, + {439, 94913}, + {440, 94996}, + {441, 95079}, + {442, 95162}, + {443, 95245}, + {444, 95328}, + {445, 95411}, + {446, 95494}, + {447, 95577}, + {448, 95660}, + {449, 95743}, + {450, 95826}, + {451, 95909}, + {452, 95992}, + {453, 96075}, + {454, 96158}, + {455, 96241}, + {456, 96324}, + {457, 96407}, + {458, 96490}, + {459, 96573}, + {460, 96656}, + {497, 98319}, + {498, 98573}, + {499, 98827}, + {500, 99081}, + {501, 99335}, + {502, 99589}, + {503, 99843}, + {504, 100097}, + {505, 100351}, + {506, 100605}, + {507, 100859}, + {508, 101113}, + {509, 101367}, + {510, 101621}, + {511, 101875}, + {512, 102129}, + {530, 104101}, + {531, 104164}, + {532, 104303}, + {533, 104442}, + {534, 104581}, + {535, 104720}, }; GpaPaddedCounterDesc kVkPaddedCounterByGroupGfx103[] = { @@ -2210,7 +2210,6 @@ namespace counter_vk_gfx103 const std::set kHwVkTimestampBlockIdsGfx103 = {535}; ///< Timestamp block id's for VK for gfx103 family const std::set kHwVkTimeCounterIndicesGfx103 = {104720, 104721, 104722, 104723, 104724, 104725}; ///< Timestamp counter indices for VK for gfx103 family const unsigned int kHwVkGroupCountGfx103 = static_cast(kHwVkGroupsGfx103.size()); - const unsigned int kHwVkExposedCountersGroupCountGfx103 = 408; const unsigned int kVkPaddedCounterGroupCountGfx103 = 0; const unsigned int kHwVkSqGroupCountGfx103 = sizeof(kHwVkSqGroupsGfx103) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwVkSqIsolatedGroupCountGfx103 = sizeof(kHwVkSqIsolatedGroupsGfx103) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.h index ac3b138a..84512164 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx103.h @@ -39,7 +39,6 @@ namespace counter_vk_gfx103 extern const std::set kHwVkTimestampBlockIdsGfx103; ///< Timestamp block id's for Vk for Gfx103 family extern const std::set kHwVkTimeCounterIndicesGfx103; ///< Timestamp counter indices for Vk for Gfx103 family extern const unsigned int kHwVkGroupCountGfx103; ///< Hardware Group Count for Vk for Gfx103 family - extern const unsigned int kHwVkExposedCountersGroupCountGfx103; ///< Exposed hardware counter Group Count for Vk for Gfx103 family extern const unsigned int kVkPaddedCounterGroupCountGfx103; ///< reserved counter group count for Vk for Gfx103 family extern const unsigned int kHwVkSqGroupCountGfx103; ///< Hardware SQ Group Count for Vk for Gfx103 family extern const unsigned int kHwVkSqIsolatedGroupCountGfx103; ///< Hardware Isolated Group Count for Vk for Gfx103 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.cc index e23be7e7..61b1062b 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.cc @@ -1673,766 +1673,766 @@ namespace counter_vk_gfx11 }; GpaCounterGroupExposedCounterDesc kHwVkExposedCountersByGroupGfx11[] = { - {0, 0, {0, 24}}, - {1, 44, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {2, 355, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {3, 666, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {4, 977, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {5, 1288, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {6, 1599, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {7, 1910, {159, 235, 259}}, - {8, 2577, {159, 235, 259}}, - {9, 3244, {159, 235, 259}}, - {10, 3911, {159, 235, 259}}, - {11, 4578, {159, 235, 259}}, - {12, 5245, {159, 235, 259}}, - {13, 5912, {159, 235, 259}}, - {14, 6579, {159, 235, 259}}, - {15, 7246, {159, 235, 259}}, - {16, 7913, {159, 235, 259}}, - {17, 8580, {159, 235, 259}}, - {18, 9247, {159, 235, 259}}, - {19, 9914, {159, 235, 259}}, - {20, 10581, {159, 235, 259}}, - {21, 11248, {159, 235, 259}}, - {22, 11915, {159, 235, 259}}, - {23, 12582, {159, 235, 259}}, - {24, 13249, {159, 235, 259}}, - {25, 13916, {159, 235, 259}}, - {26, 14583, {159, 235, 259}}, - {27, 15250, {159, 235, 259}}, - {28, 15917, {159, 235, 259}}, - {29, 16584, {159, 235, 259}}, - {30, 17251, {159, 235, 259}}, - {31, 17918, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {32, 18202, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {33, 18486, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {34, 18770, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {35, 19054, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {36, 19338, {2, 5, 22, 27, 38, 39, 42, 46, 47, 50, 57, 58, 59, 60, 73, 74, 75, 76}}, - {37, 19622, {20, 21, 24}}, - {38, 19659, {20, 21, 24}}, - {39, 19696, {20, 21, 24}}, - {40, 19733, {20, 21, 24}}, - {41, 19770, {20, 21, 24}}, - {42, 19807, {20, 21, 24}}, - {43, 19844, {20, 21, 24}}, - {44, 19881, {20, 21, 24}}, - {45, 19918, {20, 21, 24}}, - {46, 19955, {20, 21, 24}}, - {47, 19992, {20, 21, 24}}, - {48, 20029, {20, 21, 24}}, - {49, 20066, {20, 21, 24}}, - {50, 20103, {20, 21, 24}}, - {51, 20140, {20, 21, 24}}, - {52, 20177, {20, 21, 24}}, - {53, 20214, {20, 21, 24}}, - {54, 20251, {20, 21, 24}}, - {55, 20288, {20, 21, 24}}, - {56, 20325, {20, 21, 24}}, - {57, 20362, {20, 21, 24}}, - {58, 20399, {20, 21, 24}}, - {59, 20436, {20, 21, 24}}, - {60, 20473, {20, 21, 24}}, - {61, 20510, {20, 21, 24}}, - {62, 20547, {20, 21, 24}}, - {63, 20584, {20, 21, 24}}, - {64, 20621, {20, 21, 24}}, - {65, 20658, {20, 21, 24}}, - {66, 20695, {20, 21, 24}}, - {67, 20732, {12, 14, 17, 19, 22, 24, 27, 29}}, - {68, 20814, {12, 14, 17, 19, 22, 24, 27, 29}}, - {69, 20896, {12, 14, 17, 19, 22, 24, 27, 29}}, - {70, 20978, {12, 14, 17, 19, 22, 24, 27, 29}}, - {71, 21060, {12, 14, 17, 19, 22, 24, 27, 29}}, - {72, 21142, {12, 14, 17, 19, 22, 24, 27, 29}}, - {73, 21224, {12, 14, 17, 19, 22, 24, 27, 29}}, - {74, 21306, {12, 14, 17, 19, 22, 24, 27, 29}}, - {75, 21388, {12, 14, 17, 19, 22, 24, 27, 29}}, - {76, 21470, {12, 14, 17, 19, 22, 24, 27, 29}}, - {77, 21552, {12, 14, 17, 19, 22, 24, 27, 29}}, - {78, 21634, {12, 14, 17, 19, 22, 24, 27, 29}}, - {79, 21716, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {80, 21952, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {81, 22188, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {82, 22424, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {83, 22660, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {84, 22896, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {85, 23132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {86, 23368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {87, 23604, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {88, 23840, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {89, 24076, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {90, 24312, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {91, 24548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {92, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {93, 25020, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {94, 25256, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {95, 25492, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {96, 25728, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {97, 25964, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {98, 26200, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {99, 26436, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {100, 26672, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {101, 26908, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {102, 27144, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {103, 27380, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {104, 27616, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {105, 27852, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {106, 28088, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {107, 28324, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {108, 28560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {109, 28796, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {110, 29032, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {111, 29268, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {112, 29504, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {113, 29740, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {114, 29976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {115, 30212, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {116, 30448, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {117, 30684, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {118, 30920, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {119, 31156, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {120, 31392, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {121, 31628, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {122, 31864, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {123, 32100, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {124, 32336, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {125, 32572, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {126, 32808, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {127, 33044, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {128, 33280, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {129, 33516, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {130, 33752, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {131, 33988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {132, 34224, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {133, 34460, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {134, 34696, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {135, 34932, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {136, 35168, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {137, 35404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {138, 35640, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {139, 35876, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {140, 36112, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {141, 36348, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {142, 36584, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {143, 36820, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {144, 37056, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {145, 37292, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {146, 37528, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {147, 37764, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {148, 38000, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {149, 38236, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {150, 38472, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {151, 38708, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {152, 38944, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {153, 39180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {154, 39416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {155, 39652, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {156, 39888, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {157, 40124, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {158, 40360, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {159, 40596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {160, 40832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {161, 41068, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {162, 41304, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {163, 41540, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {164, 41776, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {165, 42012, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {166, 42248, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {167, 42484, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {168, 42720, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {169, 42956, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {170, 43192, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {171, 43428, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {172, 43664, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {173, 43900, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {174, 44136, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97}}, - {175, 44372, {82, 116, 117, 118}}, - {176, 44569, {82, 116, 117, 118}}, - {177, 44766, {82, 116, 117, 118}}, - {178, 44963, {82, 116, 117, 118}}, - {179, 45160, {82, 116, 117, 118}}, - {180, 45357, {82, 116, 117, 118}}, - {181, 45554, {82, 116, 117, 118}}, - {182, 45751, {82, 116, 117, 118}}, - {183, 45948, {82, 116, 117, 118}}, - {184, 46145, {82, 116, 117, 118}}, - {185, 46342, {82, 116, 117, 118}}, - {186, 46539, {82, 116, 117, 118}}, - {187, 46736, {82, 116, 117, 118}}, - {188, 46933, {82, 116, 117, 118}}, - {189, 47130, {82, 116, 117, 118}}, - {190, 47327, {82, 116, 117, 118}}, - {191, 47524, {82, 116, 117, 118}}, - {192, 47721, {82, 116, 117, 118}}, - {193, 47918, {82, 116, 117, 118}}, - {194, 48115, {82, 116, 117, 118}}, - {195, 48312, {82, 116, 117, 118}}, - {196, 48509, {82, 116, 117, 118}}, - {197, 48706, {82, 116, 117, 118}}, - {198, 48903, {82, 116, 117, 118}}, - {199, 49100, {82, 116, 117, 118}}, - {200, 49297, {82, 116, 117, 118}}, - {201, 49494, {82, 116, 117, 118}}, - {202, 49691, {82, 116, 117, 118}}, - {203, 49888, {82, 116, 117, 118}}, - {204, 50085, {82, 116, 117, 118}}, - {205, 50282, {82, 116, 117, 118}}, - {206, 50479, {82, 116, 117, 118}}, - {207, 50676, {82, 116, 117, 118}}, - {208, 50873, {82, 116, 117, 118}}, - {209, 51070, {82, 116, 117, 118}}, - {210, 51267, {82, 116, 117, 118}}, - {211, 51464, {82, 116, 117, 118}}, - {212, 51661, {82, 116, 117, 118}}, - {213, 51858, {82, 116, 117, 118}}, - {214, 52055, {82, 116, 117, 118}}, - {215, 52252, {82, 116, 117, 118}}, - {216, 52449, {82, 116, 117, 118}}, - {217, 52646, {82, 116, 117, 118}}, - {218, 52843, {82, 116, 117, 118}}, - {219, 53040, {82, 116, 117, 118}}, - {220, 53237, {82, 116, 117, 118}}, - {221, 53434, {82, 116, 117, 118}}, - {222, 53631, {82, 116, 117, 118}}, - {223, 53828, {82, 116, 117, 118}}, - {224, 54025, {82, 116, 117, 118}}, - {225, 54222, {82, 116, 117, 118}}, - {226, 54419, {82, 116, 117, 118}}, - {227, 54616, {82, 116, 117, 118}}, - {228, 54813, {82, 116, 117, 118}}, - {229, 55010, {82, 116, 117, 118}}, - {230, 55207, {82, 116, 117, 118}}, - {231, 55404, {82, 116, 117, 118}}, - {232, 55601, {82, 116, 117, 118}}, - {233, 55798, {82, 116, 117, 118}}, - {234, 55995, {82, 116, 117, 118}}, - {235, 56192, {82, 116, 117, 118}}, - {236, 56389, {82, 116, 117, 118}}, - {237, 56586, {82, 116, 117, 118}}, - {238, 56783, {82, 116, 117, 118}}, - {239, 56980, {82, 116, 117, 118}}, - {240, 57177, {82, 116, 117, 118}}, - {241, 57374, {82, 116, 117, 118}}, - {242, 57571, {82, 116, 117, 118}}, - {243, 57768, {82, 116, 117, 118}}, - {244, 57965, {82, 116, 117, 118}}, - {245, 58162, {82, 116, 117, 118}}, - {246, 58359, {82, 116, 117, 118}}, - {247, 58556, {82, 116, 117, 118}}, - {248, 58753, {82, 116, 117, 118}}, - {249, 58950, {82, 116, 117, 118}}, - {250, 59147, {82, 116, 117, 118}}, - {251, 59344, {82, 116, 117, 118}}, - {252, 59541, {82, 116, 117, 118}}, - {253, 59738, {82, 116, 117, 118}}, - {254, 59935, {82, 116, 117, 118}}, - {255, 60132, {82, 116, 117, 118}}, - {256, 60329, {82, 116, 117, 118}}, - {257, 60526, {82, 116, 117, 118}}, - {258, 60723, {82, 116, 117, 118}}, - {259, 60920, {82, 116, 117, 118}}, - {260, 61117, {82, 116, 117, 118}}, - {261, 61314, {82, 116, 117, 118}}, - {262, 61511, {82, 116, 117, 118}}, - {263, 61708, {82, 116, 117, 118}}, - {264, 61905, {82, 116, 117, 118}}, - {265, 62102, {82, 116, 117, 118}}, - {266, 62299, {82, 116, 117, 118}}, - {267, 62496, {82, 116, 117, 118}}, - {268, 62693, {82, 116, 117, 118}}, - {269, 62890, {82, 116, 117, 118}}, - {270, 63087, {82, 116, 117, 118}}, - {271, 63284, {9, 17, 39, 46, 47, 48}}, - {272, 63362, {9, 17, 39, 46, 47, 48}}, - {273, 63440, {9, 17, 39, 46, 47, 48}}, - {274, 63518, {9, 17, 39, 46, 47, 48}}, - {275, 63596, {9, 17, 39, 46, 47, 48}}, - {276, 63674, {9, 17, 39, 46, 47, 48}}, - {277, 63752, {9, 17, 39, 46, 47, 48}}, - {278, 63830, {9, 17, 39, 46, 47, 48}}, - {279, 63908, {9, 17, 39, 46, 47, 48}}, - {280, 63986, {9, 17, 39, 46, 47, 48}}, - {281, 64064, {9, 17, 39, 46, 47, 48}}, - {282, 64142, {9, 17, 39, 46, 47, 48}}, - {283, 64220, {9, 17, 39, 46, 47, 48}}, - {284, 64298, {9, 17, 39, 46, 47, 48}}, - {285, 64376, {9, 17, 39, 46, 47, 48}}, - {286, 64454, {9, 17, 39, 46, 47, 48}}, - {287, 64532, {9, 17, 39, 46, 47, 48}}, - {288, 64610, {9, 17, 39, 46, 47, 48}}, - {289, 64688, {9, 17, 39, 46, 47, 48}}, - {290, 64766, {9, 17, 39, 46, 47, 48}}, - {291, 64844, {9, 17, 39, 46, 47, 48}}, - {292, 64922, {9, 17, 39, 46, 47, 48}}, - {293, 65000, {9, 17, 39, 46, 47, 48}}, - {294, 65078, {9, 17, 39, 46, 47, 48}}, - {295, 65156, {9, 17, 39, 46, 47, 48}}, - {296, 65234, {9, 17, 39, 46, 47, 48}}, - {297, 65312, {9, 17, 39, 46, 47, 48}}, - {298, 65390, {9, 17, 39, 46, 47, 48}}, - {299, 65468, {9, 17, 39, 46, 47, 48}}, - {300, 65546, {9, 17, 39, 46, 47, 48}}, - {301, 65624, {9, 17, 39, 46, 47, 48}}, - {302, 65702, {9, 17, 39, 46, 47, 48}}, - {303, 65780, {9, 17, 39, 46, 47, 48}}, - {304, 65858, {9, 17, 39, 46, 47, 48}}, - {305, 65936, {9, 17, 39, 46, 47, 48}}, - {306, 66014, {9, 17, 39, 46, 47, 48}}, - {307, 66092, {9, 17, 39, 46, 47, 48}}, - {308, 66170, {9, 17, 39, 46, 47, 48}}, - {309, 66248, {9, 17, 39, 46, 47, 48}}, - {310, 66326, {9, 17, 39, 46, 47, 48}}, - {311, 66404, {9, 17, 39, 46, 47, 48}}, - {312, 66482, {9, 17, 39, 46, 47, 48}}, - {313, 66560, {9, 17, 39, 46, 47, 48}}, - {314, 66638, {9, 17, 39, 46, 47, 48}}, - {315, 66716, {9, 17, 39, 46, 47, 48}}, - {316, 66794, {9, 17, 39, 46, 47, 48}}, - {317, 66872, {9, 17, 39, 46, 47, 48}}, - {318, 66950, {9, 17, 39, 46, 47, 48}}, - {319, 67028, {9, 17, 39, 46, 47, 48}}, - {320, 67106, {9, 17, 39, 46, 47, 48}}, - {321, 67184, {9, 17, 39, 46, 47, 48}}, - {322, 67262, {9, 17, 39, 46, 47, 48}}, - {323, 67340, {9, 17, 39, 46, 47, 48}}, - {324, 67418, {9, 17, 39, 46, 47, 48}}, - {325, 67496, {9, 17, 39, 46, 47, 48}}, - {326, 67574, {9, 17, 39, 46, 47, 48}}, - {327, 67652, {9, 17, 39, 46, 47, 48}}, - {328, 67730, {9, 17, 39, 46, 47, 48}}, - {329, 67808, {9, 17, 39, 46, 47, 48}}, - {330, 67886, {9, 17, 39, 46, 47, 48}}, - {331, 67964, {9, 17, 39, 46, 47, 48}}, - {332, 68042, {9, 17, 39, 46, 47, 48}}, - {333, 68120, {9, 17, 39, 46, 47, 48}}, - {334, 68198, {9, 17, 39, 46, 47, 48}}, - {335, 68276, {9, 17, 39, 46, 47, 48}}, - {336, 68354, {9, 17, 39, 46, 47, 48}}, - {337, 68432, {9, 17, 39, 46, 47, 48}}, - {338, 68510, {9, 17, 39, 46, 47, 48}}, - {339, 68588, {9, 17, 39, 46, 47, 48}}, - {340, 68666, {9, 17, 39, 46, 47, 48}}, - {341, 68744, {9, 17, 39, 46, 47, 48}}, - {342, 68822, {9, 17, 39, 46, 47, 48}}, - {343, 68900, {9, 17, 39, 46, 47, 48}}, - {344, 68978, {9, 17, 39, 46, 47, 48}}, - {345, 69056, {9, 17, 39, 46, 47, 48}}, - {346, 69134, {9, 17, 39, 46, 47, 48}}, - {347, 69212, {9, 17, 39, 46, 47, 48}}, - {348, 69290, {9, 17, 39, 46, 47, 48}}, - {349, 69368, {9, 17, 39, 46, 47, 48}}, - {350, 69446, {9, 17, 39, 46, 47, 48}}, - {351, 69524, {9, 17, 39, 46, 47, 48}}, - {352, 69602, {9, 17, 39, 46, 47, 48}}, - {353, 69680, {9, 17, 39, 46, 47, 48}}, - {354, 69758, {9, 17, 39, 46, 47, 48}}, - {355, 69836, {9, 17, 39, 46, 47, 48}}, - {356, 69914, {9, 17, 39, 46, 47, 48}}, - {357, 69992, {9, 17, 39, 46, 47, 48}}, - {358, 70070, {9, 17, 39, 46, 47, 48}}, - {359, 70148, {9, 17, 39, 46, 47, 48}}, - {360, 70226, {9, 17, 39, 46, 47, 48}}, - {361, 70304, {9, 17, 39, 46, 47, 48}}, - {362, 70382, {9, 17, 39, 46, 47, 48}}, - {363, 70460, {9, 17, 39, 46, 47, 48}}, - {364, 70538, {9, 17, 39, 46, 47, 48}}, - {365, 70616, {9, 17, 39, 46, 47, 48}}, - {366, 70694, {9, 17, 39, 46, 47, 48}}, - {367, 70772, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {368, 71160, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {369, 71548, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {370, 71936, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {371, 72324, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {372, 72712, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {373, 73100, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {374, 73488, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {375, 73876, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {376, 74264, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {377, 74652, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {378, 75040, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {379, 75428, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {380, 75816, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {381, 76204, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {382, 76592, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {383, 76980, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {384, 77368, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {385, 77756, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {386, 78144, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {387, 78532, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {388, 78920, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {389, 79308, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {390, 79696, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {391, 80084, {5, 19, 21, 30, 32}}, - {392, 80398, {5, 19, 21, 30, 32}}, - {393, 80712, {5, 19, 21, 30, 32}}, - {394, 81026, {5, 19, 21, 30, 32}}, - {395, 81340, {5, 19, 21, 30, 32}}, - {396, 81654, {5, 19, 21, 30, 32}}, - {397, 81968, {5, 19, 21, 30, 32}}, - {398, 82282, {5, 19, 21, 30, 32}}, - {399, 82596, {5, 19, 21, 30, 32}}, - {400, 82910, {5, 19, 21, 30, 32}}, - {401, 83224, {5, 19, 21, 30, 32}}, - {402, 83538, {5, 19, 21, 30, 32}}, - {403, 83852, {5, 19, 21, 30, 32}}, - {404, 84166, {5, 19, 21, 30, 32}}, - {405, 84480, {5, 19, 21, 30, 32}}, - {406, 84794, {5, 19, 21, 30, 32}}, - {407, 85108, {5, 19, 21, 30, 32}}, - {408, 85422, {5, 19, 21, 30, 32}}, - {409, 85736, {5, 19, 21, 30, 32}}, - {410, 86050, {5, 19, 21, 30, 32}}, - {411, 86364, {5, 19, 21, 30, 32}}, - {412, 86678, {5, 19, 21, 30, 32}}, - {413, 86992, {5, 19, 21, 30, 32}}, - {414, 87306, {5, 19, 21, 30, 32}}, - {416, 87768, {0, 2}}, - {433, 88796, {55, 57}}, - {434, 88894, {55, 57}}, - {435, 88992, {55, 57}}, - {436, 89090, {55, 57}}, - {437, 89188, {55, 57}}, - {438, 89286, {55, 57}}, - {439, 89384, {55, 57}}, - {440, 89482, {55, 57}}, - {441, 89580, {55, 57}}, - {442, 89678, {55, 57}}, - {443, 89776, {55, 57}}, - {444, 89874, {55, 57}}, - {445, 89972, {55, 57}}, - {446, 90070, {55, 57}}, - {447, 90168, {55, 57}}, - {448, 90266, {55, 57}}, - {449, 90364, {55, 57}}, - {450, 90462, {55, 57}}, - {451, 90560, {55, 57}}, - {452, 90658, {55, 57}}, - {453, 90756, {55, 57}}, - {454, 90854, {55, 57}}, - {455, 90952, {55, 57}}, - {456, 91050, {55, 57}}, - {543, 99172, {14, 18}}, - {544, 99256, {14, 18}}, - {545, 99340, {14, 18}}, - {546, 99424, {14, 18}}, - {547, 99508, {14, 18}}, - {548, 99592, {14, 18}}, - {549, 99676, {14, 18}}, - {550, 99760, {14, 18}}, - {551, 99844, {14, 18}}, - {552, 99928, {14, 18}}, - {553, 100012, {14, 18}}, - {554, 100096, {14, 18}}, - {555, 100180, {14, 18}}, - {556, 100264, {14, 18}}, - {557, 100348, {14, 18}}, - {558, 100432, {14, 18}}, - {559, 100516, {14, 18}}, - {560, 100600, {14, 18}}, - {561, 100684, {14, 18}}, - {562, 100768, {14, 18}}, - {563, 100852, {14, 18}}, - {564, 100936, {14, 18}}, - {565, 101020, {14, 18}}, - {566, 101104, {14, 18}}, - {567, 101188, {14, 18}}, - {568, 101272, {14, 18}}, - {569, 101356, {14, 18}}, - {570, 101440, {14, 18}}, - {571, 101524, {14, 18}}, - {572, 101608, {14, 18}}, - {573, 101692, {14, 18}}, - {574, 101776, {14, 18}}, - {575, 101860, {14, 18}}, - {576, 101944, {14, 18}}, - {577, 102028, {14, 18}}, - {578, 102112, {14, 18}}, - {579, 102196, {14, 18}}, - {580, 102280, {14, 18}}, - {581, 102364, {14, 18}}, - {582, 102448, {14, 18}}, - {583, 102532, {14, 18}}, - {584, 102616, {14, 18}}, - {585, 102700, {14, 18}}, - {586, 102784, {14, 18}}, - {587, 102868, {14, 18}}, - {588, 102952, {14, 18}}, - {589, 103036, {14, 18}}, - {590, 103120, {14, 18}}, - {595, 103636, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {596, 103895, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {597, 104154, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {598, 104413, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {599, 104672, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {600, 104931, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {601, 105190, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {602, 105449, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {603, 105708, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {604, 105967, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {605, 106226, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {606, 106485, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {607, 106744, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {608, 107003, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {609, 107262, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {610, 107521, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {611, 107780, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {612, 108039, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {613, 108298, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {614, 108557, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {615, 108816, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {616, 109075, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {617, 109334, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {618, 109593, {3, 43, 83, 85, 88, 99, 100, 101, 102}}, - {640, 112259, {39}}, - {641, 112360, {0, 12, 17, 23, 79, 80}}, - {642, 112448, {0, 12, 17, 23, 79, 80}}, - {643, 112536, {0, 12, 17, 23, 79, 80}}, - {644, 112624, {0, 12, 17, 23, 79, 80}}, - {645, 112712, {0, 12, 17, 23, 79, 80}}, - {646, 112800, {0, 12, 17, 23, 79, 80}}, - {647, 112888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {648, 113400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {649, 113912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {650, 114424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {651, 114936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {652, 115448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {653, 115960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {654, 116472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {655, 116984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {656, 117496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {657, 118008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {658, 118520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {659, 119032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {660, 119544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {661, 120056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {662, 120568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {663, 121080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {664, 121592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {665, 122104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {666, 122616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {667, 123128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {668, 123640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {669, 124152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {670, 124664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {671, 125176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {672, 125688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {673, 126200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {674, 126712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {675, 127224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {676, 127736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {677, 128248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {678, 128760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {679, 129272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {680, 129784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {681, 130296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {682, 130808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {683, 131320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {684, 131832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {685, 132344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {686, 132856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {687, 133368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {688, 133880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {689, 134392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {690, 134904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {691, 135416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {692, 135928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {693, 136440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {694, 136952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {695, 137464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {696, 137976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {697, 138488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {698, 139000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {699, 139512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {700, 140024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {701, 140536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {702, 141048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {703, 141560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {704, 142072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {705, 142584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {706, 143096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {707, 143608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {708, 144120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {709, 144632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {710, 145144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {711, 145656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {712, 146168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {713, 146680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {714, 147192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {715, 147704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {716, 148216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {717, 148728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {718, 149240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {719, 149752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {720, 150264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {721, 150776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {722, 151288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {723, 151800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {724, 152312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {725, 152824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {726, 153336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {727, 153848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {728, 154360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {729, 154872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {730, 155384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {731, 155896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {732, 156408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {733, 156920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {734, 157432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {735, 157944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {736, 158456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {737, 158968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {738, 159480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {739, 159992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {740, 160504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {741, 161016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {742, 161528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {743, 162040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {744, 162552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {745, 163064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {746, 163576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {747, 164088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {748, 164600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {749, 165112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {750, 165624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {751, 166136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {752, 166648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {753, 167160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {754, 167672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {755, 168184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {756, 168696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {757, 169208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {758, 169720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {759, 170232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {760, 170744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {761, 171256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {762, 171768, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {763, 172280, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {764, 172792, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {765, 173304, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {766, 173816, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {767, 174328, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {768, 174840, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {769, 175352, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {770, 175864, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {771, 176376, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {772, 176888, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {773, 177400, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {774, 177912, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {775, 178424, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {776, 178936, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {777, 179448, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {778, 179960, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {779, 180472, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {780, 180984, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {781, 181496, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {782, 182008, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {783, 182520, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {784, 183032, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {785, 183544, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {786, 184056, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {787, 184568, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {788, 185080, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {789, 185592, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {790, 186104, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {791, 186616, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {792, 187128, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {793, 187640, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {794, 188152, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {795, 188664, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {796, 189176, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {797, 189688, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {798, 190200, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {799, 190712, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {800, 191224, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {801, 191736, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {802, 192248, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {803, 192760, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {804, 193272, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {805, 193784, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {806, 194296, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {807, 194808, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {808, 195320, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {809, 195832, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {810, 196344, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {811, 196856, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {812, 197368, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {813, 197880, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {814, 198392, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {815, 198904, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {816, 199416, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {817, 199928, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {818, 200440, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {819, 200952, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {820, 201464, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {821, 201976, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {822, 202488, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {823, 203000, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {824, 203512, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {825, 204024, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {826, 204536, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {827, 205048, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {828, 205560, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {829, 206072, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {830, 206584, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {831, 207096, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {832, 207608, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {833, 208120, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {834, 208632, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {835, 209144, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {836, 209656, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {837, 210168, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {838, 210680, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {839, 211192, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {840, 211704, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {841, 212216, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {842, 212728, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {843, 213240, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {844, 213752, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {845, 214264, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {846, 214776, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {847, 215288, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {848, 215800, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {849, 216312, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {850, 216824, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {851, 217336, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {852, 217848, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {853, 218360, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {854, 218872, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {855, 219384, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {856, 219896, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {857, 220408, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {858, 220920, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {859, 221432, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {860, 221944, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {861, 222456, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {862, 222968, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {863, 223480, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {864, 223992, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {865, 224504, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {866, 225016, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {867, 225528, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {868, 226040, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {869, 226552, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {870, 227064, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {871, 227576, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {872, 228088, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {873, 228600, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {874, 229112, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {875, 229624, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {876, 230136, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {877, 230648, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {878, 231160, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {879, 231672, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {880, 232184, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {881, 232696, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {882, 233208, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {883, 233720, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {884, 234232, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {885, 234744, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {886, 235256, {4, 5, 8, 29, 54, 56, 57, 58, 59, 62, 66, 67, 80, 103, 256, 269, 270, 271, 272, 293, 294, 295, 296}}, - {887, 235768, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {1, 44}, + {2, 355}, + {3, 666}, + {4, 977}, + {5, 1288}, + {6, 1599}, + {7, 1910}, + {8, 2577}, + {9, 3244}, + {10, 3911}, + {11, 4578}, + {12, 5245}, + {13, 5912}, + {14, 6579}, + {15, 7246}, + {16, 7913}, + {17, 8580}, + {18, 9247}, + {19, 9914}, + {20, 10581}, + {21, 11248}, + {22, 11915}, + {23, 12582}, + {24, 13249}, + {25, 13916}, + {26, 14583}, + {27, 15250}, + {28, 15917}, + {29, 16584}, + {30, 17251}, + {31, 17918}, + {32, 18202}, + {33, 18486}, + {34, 18770}, + {35, 19054}, + {36, 19338}, + {37, 19622}, + {38, 19659}, + {39, 19696}, + {40, 19733}, + {41, 19770}, + {42, 19807}, + {43, 19844}, + {44, 19881}, + {45, 19918}, + {46, 19955}, + {47, 19992}, + {48, 20029}, + {49, 20066}, + {50, 20103}, + {51, 20140}, + {52, 20177}, + {53, 20214}, + {54, 20251}, + {55, 20288}, + {56, 20325}, + {57, 20362}, + {58, 20399}, + {59, 20436}, + {60, 20473}, + {61, 20510}, + {62, 20547}, + {63, 20584}, + {64, 20621}, + {65, 20658}, + {66, 20695}, + {67, 20732}, + {68, 20814}, + {69, 20896}, + {70, 20978}, + {71, 21060}, + {72, 21142}, + {73, 21224}, + {74, 21306}, + {75, 21388}, + {76, 21470}, + {77, 21552}, + {78, 21634}, + {79, 21716}, + {80, 21952}, + {81, 22188}, + {82, 22424}, + {83, 22660}, + {84, 22896}, + {85, 23132}, + {86, 23368}, + {87, 23604}, + {88, 23840}, + {89, 24076}, + {90, 24312}, + {91, 24548}, + {92, 24784}, + {93, 25020}, + {94, 25256}, + {95, 25492}, + {96, 25728}, + {97, 25964}, + {98, 26200}, + {99, 26436}, + {100, 26672}, + {101, 26908}, + {102, 27144}, + {103, 27380}, + {104, 27616}, + {105, 27852}, + {106, 28088}, + {107, 28324}, + {108, 28560}, + {109, 28796}, + {110, 29032}, + {111, 29268}, + {112, 29504}, + {113, 29740}, + {114, 29976}, + {115, 30212}, + {116, 30448}, + {117, 30684}, + {118, 30920}, + {119, 31156}, + {120, 31392}, + {121, 31628}, + {122, 31864}, + {123, 32100}, + {124, 32336}, + {125, 32572}, + {126, 32808}, + {127, 33044}, + {128, 33280}, + {129, 33516}, + {130, 33752}, + {131, 33988}, + {132, 34224}, + {133, 34460}, + {134, 34696}, + {135, 34932}, + {136, 35168}, + {137, 35404}, + {138, 35640}, + {139, 35876}, + {140, 36112}, + {141, 36348}, + {142, 36584}, + {143, 36820}, + {144, 37056}, + {145, 37292}, + {146, 37528}, + {147, 37764}, + {148, 38000}, + {149, 38236}, + {150, 38472}, + {151, 38708}, + {152, 38944}, + {153, 39180}, + {154, 39416}, + {155, 39652}, + {156, 39888}, + {157, 40124}, + {158, 40360}, + {159, 40596}, + {160, 40832}, + {161, 41068}, + {162, 41304}, + {163, 41540}, + {164, 41776}, + {165, 42012}, + {166, 42248}, + {167, 42484}, + {168, 42720}, + {169, 42956}, + {170, 43192}, + {171, 43428}, + {172, 43664}, + {173, 43900}, + {174, 44136}, + {175, 44372}, + {176, 44569}, + {177, 44766}, + {178, 44963}, + {179, 45160}, + {180, 45357}, + {181, 45554}, + {182, 45751}, + {183, 45948}, + {184, 46145}, + {185, 46342}, + {186, 46539}, + {187, 46736}, + {188, 46933}, + {189, 47130}, + {190, 47327}, + {191, 47524}, + {192, 47721}, + {193, 47918}, + {194, 48115}, + {195, 48312}, + {196, 48509}, + {197, 48706}, + {198, 48903}, + {199, 49100}, + {200, 49297}, + {201, 49494}, + {202, 49691}, + {203, 49888}, + {204, 50085}, + {205, 50282}, + {206, 50479}, + {207, 50676}, + {208, 50873}, + {209, 51070}, + {210, 51267}, + {211, 51464}, + {212, 51661}, + {213, 51858}, + {214, 52055}, + {215, 52252}, + {216, 52449}, + {217, 52646}, + {218, 52843}, + {219, 53040}, + {220, 53237}, + {221, 53434}, + {222, 53631}, + {223, 53828}, + {224, 54025}, + {225, 54222}, + {226, 54419}, + {227, 54616}, + {228, 54813}, + {229, 55010}, + {230, 55207}, + {231, 55404}, + {232, 55601}, + {233, 55798}, + {234, 55995}, + {235, 56192}, + {236, 56389}, + {237, 56586}, + {238, 56783}, + {239, 56980}, + {240, 57177}, + {241, 57374}, + {242, 57571}, + {243, 57768}, + {244, 57965}, + {245, 58162}, + {246, 58359}, + {247, 58556}, + {248, 58753}, + {249, 58950}, + {250, 59147}, + {251, 59344}, + {252, 59541}, + {253, 59738}, + {254, 59935}, + {255, 60132}, + {256, 60329}, + {257, 60526}, + {258, 60723}, + {259, 60920}, + {260, 61117}, + {261, 61314}, + {262, 61511}, + {263, 61708}, + {264, 61905}, + {265, 62102}, + {266, 62299}, + {267, 62496}, + {268, 62693}, + {269, 62890}, + {270, 63087}, + {271, 63284}, + {272, 63362}, + {273, 63440}, + {274, 63518}, + {275, 63596}, + {276, 63674}, + {277, 63752}, + {278, 63830}, + {279, 63908}, + {280, 63986}, + {281, 64064}, + {282, 64142}, + {283, 64220}, + {284, 64298}, + {285, 64376}, + {286, 64454}, + {287, 64532}, + {288, 64610}, + {289, 64688}, + {290, 64766}, + {291, 64844}, + {292, 64922}, + {293, 65000}, + {294, 65078}, + {295, 65156}, + {296, 65234}, + {297, 65312}, + {298, 65390}, + {299, 65468}, + {300, 65546}, + {301, 65624}, + {302, 65702}, + {303, 65780}, + {304, 65858}, + {305, 65936}, + {306, 66014}, + {307, 66092}, + {308, 66170}, + {309, 66248}, + {310, 66326}, + {311, 66404}, + {312, 66482}, + {313, 66560}, + {314, 66638}, + {315, 66716}, + {316, 66794}, + {317, 66872}, + {318, 66950}, + {319, 67028}, + {320, 67106}, + {321, 67184}, + {322, 67262}, + {323, 67340}, + {324, 67418}, + {325, 67496}, + {326, 67574}, + {327, 67652}, + {328, 67730}, + {329, 67808}, + {330, 67886}, + {331, 67964}, + {332, 68042}, + {333, 68120}, + {334, 68198}, + {335, 68276}, + {336, 68354}, + {337, 68432}, + {338, 68510}, + {339, 68588}, + {340, 68666}, + {341, 68744}, + {342, 68822}, + {343, 68900}, + {344, 68978}, + {345, 69056}, + {346, 69134}, + {347, 69212}, + {348, 69290}, + {349, 69368}, + {350, 69446}, + {351, 69524}, + {352, 69602}, + {353, 69680}, + {354, 69758}, + {355, 69836}, + {356, 69914}, + {357, 69992}, + {358, 70070}, + {359, 70148}, + {360, 70226}, + {361, 70304}, + {362, 70382}, + {363, 70460}, + {364, 70538}, + {365, 70616}, + {366, 70694}, + {367, 70772}, + {368, 71160}, + {369, 71548}, + {370, 71936}, + {371, 72324}, + {372, 72712}, + {373, 73100}, + {374, 73488}, + {375, 73876}, + {376, 74264}, + {377, 74652}, + {378, 75040}, + {379, 75428}, + {380, 75816}, + {381, 76204}, + {382, 76592}, + {383, 76980}, + {384, 77368}, + {385, 77756}, + {386, 78144}, + {387, 78532}, + {388, 78920}, + {389, 79308}, + {390, 79696}, + {391, 80084}, + {392, 80398}, + {393, 80712}, + {394, 81026}, + {395, 81340}, + {396, 81654}, + {397, 81968}, + {398, 82282}, + {399, 82596}, + {400, 82910}, + {401, 83224}, + {402, 83538}, + {403, 83852}, + {404, 84166}, + {405, 84480}, + {406, 84794}, + {407, 85108}, + {408, 85422}, + {409, 85736}, + {410, 86050}, + {411, 86364}, + {412, 86678}, + {413, 86992}, + {414, 87306}, + {416, 87768}, + {433, 88796}, + {434, 88894}, + {435, 88992}, + {436, 89090}, + {437, 89188}, + {438, 89286}, + {439, 89384}, + {440, 89482}, + {441, 89580}, + {442, 89678}, + {443, 89776}, + {444, 89874}, + {445, 89972}, + {446, 90070}, + {447, 90168}, + {448, 90266}, + {449, 90364}, + {450, 90462}, + {451, 90560}, + {452, 90658}, + {453, 90756}, + {454, 90854}, + {455, 90952}, + {456, 91050}, + {543, 99172}, + {544, 99256}, + {545, 99340}, + {546, 99424}, + {547, 99508}, + {548, 99592}, + {549, 99676}, + {550, 99760}, + {551, 99844}, + {552, 99928}, + {553, 100012}, + {554, 100096}, + {555, 100180}, + {556, 100264}, + {557, 100348}, + {558, 100432}, + {559, 100516}, + {560, 100600}, + {561, 100684}, + {562, 100768}, + {563, 100852}, + {564, 100936}, + {565, 101020}, + {566, 101104}, + {567, 101188}, + {568, 101272}, + {569, 101356}, + {570, 101440}, + {571, 101524}, + {572, 101608}, + {573, 101692}, + {574, 101776}, + {575, 101860}, + {576, 101944}, + {577, 102028}, + {578, 102112}, + {579, 102196}, + {580, 102280}, + {581, 102364}, + {582, 102448}, + {583, 102532}, + {584, 102616}, + {585, 102700}, + {586, 102784}, + {587, 102868}, + {588, 102952}, + {589, 103036}, + {590, 103120}, + {595, 103636}, + {596, 103895}, + {597, 104154}, + {598, 104413}, + {599, 104672}, + {600, 104931}, + {601, 105190}, + {602, 105449}, + {603, 105708}, + {604, 105967}, + {605, 106226}, + {606, 106485}, + {607, 106744}, + {608, 107003}, + {609, 107262}, + {610, 107521}, + {611, 107780}, + {612, 108039}, + {613, 108298}, + {614, 108557}, + {615, 108816}, + {616, 109075}, + {617, 109334}, + {618, 109593}, + {640, 112259}, + {641, 112360}, + {642, 112448}, + {643, 112536}, + {644, 112624}, + {645, 112712}, + {646, 112800}, + {647, 112888}, + {648, 113400}, + {649, 113912}, + {650, 114424}, + {651, 114936}, + {652, 115448}, + {653, 115960}, + {654, 116472}, + {655, 116984}, + {656, 117496}, + {657, 118008}, + {658, 118520}, + {659, 119032}, + {660, 119544}, + {661, 120056}, + {662, 120568}, + {663, 121080}, + {664, 121592}, + {665, 122104}, + {666, 122616}, + {667, 123128}, + {668, 123640}, + {669, 124152}, + {670, 124664}, + {671, 125176}, + {672, 125688}, + {673, 126200}, + {674, 126712}, + {675, 127224}, + {676, 127736}, + {677, 128248}, + {678, 128760}, + {679, 129272}, + {680, 129784}, + {681, 130296}, + {682, 130808}, + {683, 131320}, + {684, 131832}, + {685, 132344}, + {686, 132856}, + {687, 133368}, + {688, 133880}, + {689, 134392}, + {690, 134904}, + {691, 135416}, + {692, 135928}, + {693, 136440}, + {694, 136952}, + {695, 137464}, + {696, 137976}, + {697, 138488}, + {698, 139000}, + {699, 139512}, + {700, 140024}, + {701, 140536}, + {702, 141048}, + {703, 141560}, + {704, 142072}, + {705, 142584}, + {706, 143096}, + {707, 143608}, + {708, 144120}, + {709, 144632}, + {710, 145144}, + {711, 145656}, + {712, 146168}, + {713, 146680}, + {714, 147192}, + {715, 147704}, + {716, 148216}, + {717, 148728}, + {718, 149240}, + {719, 149752}, + {720, 150264}, + {721, 150776}, + {722, 151288}, + {723, 151800}, + {724, 152312}, + {725, 152824}, + {726, 153336}, + {727, 153848}, + {728, 154360}, + {729, 154872}, + {730, 155384}, + {731, 155896}, + {732, 156408}, + {733, 156920}, + {734, 157432}, + {735, 157944}, + {736, 158456}, + {737, 158968}, + {738, 159480}, + {739, 159992}, + {740, 160504}, + {741, 161016}, + {742, 161528}, + {743, 162040}, + {744, 162552}, + {745, 163064}, + {746, 163576}, + {747, 164088}, + {748, 164600}, + {749, 165112}, + {750, 165624}, + {751, 166136}, + {752, 166648}, + {753, 167160}, + {754, 167672}, + {755, 168184}, + {756, 168696}, + {757, 169208}, + {758, 169720}, + {759, 170232}, + {760, 170744}, + {761, 171256}, + {762, 171768}, + {763, 172280}, + {764, 172792}, + {765, 173304}, + {766, 173816}, + {767, 174328}, + {768, 174840}, + {769, 175352}, + {770, 175864}, + {771, 176376}, + {772, 176888}, + {773, 177400}, + {774, 177912}, + {775, 178424}, + {776, 178936}, + {777, 179448}, + {778, 179960}, + {779, 180472}, + {780, 180984}, + {781, 181496}, + {782, 182008}, + {783, 182520}, + {784, 183032}, + {785, 183544}, + {786, 184056}, + {787, 184568}, + {788, 185080}, + {789, 185592}, + {790, 186104}, + {791, 186616}, + {792, 187128}, + {793, 187640}, + {794, 188152}, + {795, 188664}, + {796, 189176}, + {797, 189688}, + {798, 190200}, + {799, 190712}, + {800, 191224}, + {801, 191736}, + {802, 192248}, + {803, 192760}, + {804, 193272}, + {805, 193784}, + {806, 194296}, + {807, 194808}, + {808, 195320}, + {809, 195832}, + {810, 196344}, + {811, 196856}, + {812, 197368}, + {813, 197880}, + {814, 198392}, + {815, 198904}, + {816, 199416}, + {817, 199928}, + {818, 200440}, + {819, 200952}, + {820, 201464}, + {821, 201976}, + {822, 202488}, + {823, 203000}, + {824, 203512}, + {825, 204024}, + {826, 204536}, + {827, 205048}, + {828, 205560}, + {829, 206072}, + {830, 206584}, + {831, 207096}, + {832, 207608}, + {833, 208120}, + {834, 208632}, + {835, 209144}, + {836, 209656}, + {837, 210168}, + {838, 210680}, + {839, 211192}, + {840, 211704}, + {841, 212216}, + {842, 212728}, + {843, 213240}, + {844, 213752}, + {845, 214264}, + {846, 214776}, + {847, 215288}, + {848, 215800}, + {849, 216312}, + {850, 216824}, + {851, 217336}, + {852, 217848}, + {853, 218360}, + {854, 218872}, + {855, 219384}, + {856, 219896}, + {857, 220408}, + {858, 220920}, + {859, 221432}, + {860, 221944}, + {861, 222456}, + {862, 222968}, + {863, 223480}, + {864, 223992}, + {865, 224504}, + {866, 225016}, + {867, 225528}, + {868, 226040}, + {869, 226552}, + {870, 227064}, + {871, 227576}, + {872, 228088}, + {873, 228600}, + {874, 229112}, + {875, 229624}, + {876, 230136}, + {877, 230648}, + {878, 231160}, + {879, 231672}, + {880, 232184}, + {881, 232696}, + {882, 233208}, + {883, 233720}, + {884, 234232}, + {885, 234744}, + {886, 235256}, + {887, 235768}, }; GpaPaddedCounterDesc kVkPaddedCounterByGroupGfx11[] = { @@ -3904,7 +3904,6 @@ namespace counter_vk_gfx11 const std::set kHwVkTimestampBlockIdsGfx11 = {887}; ///< Timestamp block id's for VK for gfx11 family const std::set kHwVkTimeCounterIndicesGfx11 = {235768, 235769, 235770, 235771, 235772, 235773}; ///< Timestamp counter indices for VK for gfx11 family const unsigned int kHwVkGroupCountGfx11 = static_cast(kHwVkGroupsGfx11.size()); - const unsigned int kHwVkExposedCountersGroupCountGfx11 = 760; const unsigned int kVkPaddedCounterGroupCountGfx11 = 0; const unsigned int kHwVkSqGroupCountGfx11 = sizeof(kHwVkSqGroupsGfx11) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwVkSqIsolatedGroupCountGfx11 = sizeof(kHwVkSqIsolatedGroupsGfx11) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.h index e7017640..21eed36a 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx11.h @@ -39,7 +39,6 @@ namespace counter_vk_gfx11 extern const std::set kHwVkTimestampBlockIdsGfx11; ///< Timestamp block id's for Vk for Gfx11 family extern const std::set kHwVkTimeCounterIndicesGfx11; ///< Timestamp counter indices for Vk for Gfx11 family extern const unsigned int kHwVkGroupCountGfx11; ///< Hardware Group Count for Vk for Gfx11 family - extern const unsigned int kHwVkExposedCountersGroupCountGfx11; ///< Exposed hardware counter Group Count for Vk for Gfx11 family extern const unsigned int kVkPaddedCounterGroupCountGfx11; ///< reserved counter group count for Vk for Gfx11 family extern const unsigned int kHwVkSqGroupCountGfx11; ///< Hardware SQ Group Count for Vk for Gfx11 family extern const unsigned int kHwVkSqIsolatedGroupCountGfx11; ///< Hardware Isolated Group Count for Vk for Gfx11 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.cc index 863f6af3..f6ded0ae 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.cc @@ -598,236 +598,236 @@ namespace counter_vk_gfx8 }; GpaCounterGroupExposedCounterDesc kHwVkExposedCountersByGroupGfx8[] = { - {3, 67, {1, 9, 20, 96, 105, 124}}, - {4, 214, {1, 9, 20, 96, 105, 124}}, - {5, 361, {1, 9, 20, 96, 105, 124}}, - {6, 508, {1, 9, 20, 96, 105, 124}}, - {7, 655, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 808, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 961, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1114, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 1267, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {12, 1664, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {13, 2061, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {14, 2458, {163, 164, 165, 166, 239, 240, 241, 242, 263}}, - {15, 2855, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {16, 3052, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {17, 3249, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {18, 3446, {1, 10, 17, 20, 26, 32, 38, 44, 48, 54, 58, 59, 62, 64, 65, 68, 70, 75}}, - {19, 3643, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {20, 3942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {21, 4241, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {22, 4540, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {23, 4839, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {24, 5138, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {25, 5437, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {26, 5736, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {27, 6035, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {28, 6334, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {29, 6633, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {30, 6932, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {31, 7231, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {32, 7530, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {33, 7829, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {34, 8128, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {35, 8427, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {36, 8726, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {37, 9025, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {38, 9324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {39, 9623, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {40, 9922, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {41, 10221, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {42, 10520, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {43, 10819, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {44, 11118, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {45, 11417, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {46, 11716, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {47, 12015, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {48, 12314, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {49, 12613, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {50, 12912, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 61, 81, 86, 89, 97}}, - {51, 13211, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 13245, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 13279, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 13313, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 13347, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 13466, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 13585, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 13704, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 13823, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 13942, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 14061, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 14180, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 14299, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 14418, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 14537, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 14656, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 14775, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 14894, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 15013, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 15132, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 15251, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 15370, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 15489, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 15608, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 15727, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 15846, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 15965, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 16084, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 16203, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 16322, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 16441, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 16560, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 16679, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 16798, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 16917, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 17036, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 17155, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 17274, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 17393, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 17512, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 17631, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 17750, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 17869, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 17988, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 18107, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 18226, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 18345, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 18464, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 18583, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 18702, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 18821, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 18940, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 19059, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 19178, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 19297, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 19416, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 19535, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 19654, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 19773, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 19892, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 20011, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 20130, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 20249, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 20368, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 20487, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 20606, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 20725, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 20844, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 24483, {3, 7, 8, 9}}, - {184, 24663, {3, 7, 8, 9}}, - {185, 24843, {3, 7, 8, 9}}, - {186, 25023, {3, 7, 8, 9}}, - {187, 25203, {3, 7, 8, 9}}, - {188, 25383, {3, 7, 8, 9}}, - {189, 25563, {3, 7, 8, 9}}, - {190, 25743, {3, 7, 8, 9}}, - {191, 25923, {3, 7, 8, 9}}, - {192, 26103, {3, 7, 8, 9}}, - {193, 26283, {3, 7, 8, 9}}, - {194, 26463, {3, 7, 8, 9}}, - {195, 26643, {3, 7, 8, 9}}, - {196, 26823, {3, 7, 8, 9}}, - {197, 27003, {3, 7, 8, 9}}, - {198, 27183, {3, 7, 8, 9}}, - {199, 27363, {3, 7, 8, 9}}, - {200, 27543, {3, 7, 8, 9}}, - {201, 27723, {3, 7, 8, 9}}, - {202, 27903, {3, 7, 8, 9}}, - {203, 28083, {3, 7, 8, 9}}, - {204, 28263, {3, 7, 8, 9}}, - {205, 28443, {3, 7, 8, 9}}, - {206, 28623, {3, 7, 8, 9}}, - {207, 28803, {3, 7, 8, 9}}, - {208, 28983, {3, 7, 8, 9}}, - {209, 29163, {3, 7, 8, 9}}, - {210, 29343, {3, 7, 8, 9}}, - {211, 29523, {3, 7, 8, 9}}, - {212, 29703, {3, 7, 8, 9}}, - {213, 29883, {3, 7, 8, 9}}, - {214, 30063, {3, 7, 8, 9}}, - {215, 30243, {3, 7, 8, 9}}, - {216, 30423, {3, 7, 8, 9}}, - {217, 30603, {3, 7, 8, 9}}, - {218, 30783, {3, 7, 8, 9}}, - {219, 30963, {3, 7, 8, 9}}, - {220, 31143, {3, 7, 8, 9}}, - {221, 31323, {3, 7, 8, 9}}, - {222, 31503, {3, 7, 8, 9}}, - {223, 31683, {3, 7, 8, 9}}, - {224, 31863, {3, 7, 8, 9}}, - {225, 32043, {3, 7, 8, 9}}, - {226, 32223, {3, 7, 8, 9}}, - {227, 32403, {3, 7, 8, 9}}, - {228, 32583, {3, 7, 8, 9}}, - {229, 32763, {3, 7, 8, 9}}, - {230, 32943, {3, 7, 8, 9}}, - {231, 33123, {3, 7, 8, 9}}, - {232, 33303, {3, 7, 8, 9}}, - {233, 33483, {3, 7, 8, 9}}, - {234, 33663, {3, 7, 8, 9}}, - {235, 33843, {3, 7, 8, 9}}, - {236, 34023, {3, 7, 8, 9}}, - {237, 34203, {3, 7, 8, 9}}, - {238, 34383, {3, 7, 8, 9}}, - {239, 34563, {3, 7, 8, 9}}, - {240, 34743, {3, 7, 8, 9}}, - {241, 34923, {3, 7, 8, 9}}, - {242, 35103, {3, 7, 8, 9}}, - {243, 35283, {3, 7, 8, 9}}, - {244, 35463, {3, 7, 8, 9}}, - {245, 35643, {3, 7, 8, 9}}, - {246, 35823, {3, 7, 8, 9}}, - {247, 36003, {18, 19, 26, 28, 35}}, - {248, 36195, {18, 19, 26, 28, 35}}, - {249, 36387, {18, 19, 26, 28, 35}}, - {250, 36579, {18, 19, 26, 28, 35}}, - {251, 36771, {18, 19, 26, 28, 35}}, - {252, 36963, {18, 19, 26, 28, 35}}, - {253, 37155, {18, 19, 26, 28, 35}}, - {254, 37347, {18, 19, 26, 28, 35}}, - {255, 37539, {18, 19, 26, 28, 35}}, - {256, 37731, {18, 19, 26, 28, 35}}, - {257, 37923, {18, 19, 26, 28, 35}}, - {258, 38115, {18, 19, 26, 28, 35}}, - {259, 38307, {18, 19, 26, 28, 35}}, - {260, 38499, {18, 19, 26, 28, 35}}, - {261, 38691, {18, 19, 26, 28, 35}}, - {262, 38883, {18, 19, 26, 28, 35}}, - {265, 39145, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39402, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39659, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39916, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40173, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40430, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40687, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 40944, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41201, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41458, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 41715, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 41972, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42229, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 42486, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 42743, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43000, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 43257, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 43653, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 44049, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 44445, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 44841, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 45237, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 45633, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 46029, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 46425, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 46821, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 47217, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 47613, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 48009, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 48405, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 48801, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 49197, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {299, 49741, {0, 2}}, - {342, 51131, {0, 1, 2, 3, 4, 5}}, + {3, 67}, + {4, 214}, + {5, 361}, + {6, 508}, + {7, 655}, + {8, 808}, + {9, 961}, + {10, 1114}, + {11, 1267}, + {12, 1664}, + {13, 2061}, + {14, 2458}, + {15, 2855}, + {16, 3052}, + {17, 3249}, + {18, 3446}, + {19, 3643}, + {20, 3942}, + {21, 4241}, + {22, 4540}, + {23, 4839}, + {24, 5138}, + {25, 5437}, + {26, 5736}, + {27, 6035}, + {28, 6334}, + {29, 6633}, + {30, 6932}, + {31, 7231}, + {32, 7530}, + {33, 7829}, + {34, 8128}, + {35, 8427}, + {36, 8726}, + {37, 9025}, + {38, 9324}, + {39, 9623}, + {40, 9922}, + {41, 10221}, + {42, 10520}, + {43, 10819}, + {44, 11118}, + {45, 11417}, + {46, 11716}, + {47, 12015}, + {48, 12314}, + {49, 12613}, + {50, 12912}, + {51, 13211}, + {52, 13245}, + {53, 13279}, + {54, 13313}, + {55, 13347}, + {56, 13466}, + {57, 13585}, + {58, 13704}, + {59, 13823}, + {60, 13942}, + {61, 14061}, + {62, 14180}, + {63, 14299}, + {64, 14418}, + {65, 14537}, + {66, 14656}, + {67, 14775}, + {68, 14894}, + {69, 15013}, + {70, 15132}, + {71, 15251}, + {72, 15370}, + {73, 15489}, + {74, 15608}, + {75, 15727}, + {76, 15846}, + {77, 15965}, + {78, 16084}, + {79, 16203}, + {80, 16322}, + {81, 16441}, + {82, 16560}, + {83, 16679}, + {84, 16798}, + {85, 16917}, + {86, 17036}, + {87, 17155}, + {88, 17274}, + {89, 17393}, + {90, 17512}, + {91, 17631}, + {92, 17750}, + {93, 17869}, + {94, 17988}, + {95, 18107}, + {96, 18226}, + {97, 18345}, + {98, 18464}, + {99, 18583}, + {100, 18702}, + {101, 18821}, + {102, 18940}, + {103, 19059}, + {104, 19178}, + {105, 19297}, + {106, 19416}, + {107, 19535}, + {108, 19654}, + {109, 19773}, + {110, 19892}, + {111, 20011}, + {112, 20130}, + {113, 20249}, + {114, 20368}, + {115, 20487}, + {116, 20606}, + {117, 20725}, + {118, 20844}, + {183, 24483}, + {184, 24663}, + {185, 24843}, + {186, 25023}, + {187, 25203}, + {188, 25383}, + {189, 25563}, + {190, 25743}, + {191, 25923}, + {192, 26103}, + {193, 26283}, + {194, 26463}, + {195, 26643}, + {196, 26823}, + {197, 27003}, + {198, 27183}, + {199, 27363}, + {200, 27543}, + {201, 27723}, + {202, 27903}, + {203, 28083}, + {204, 28263}, + {205, 28443}, + {206, 28623}, + {207, 28803}, + {208, 28983}, + {209, 29163}, + {210, 29343}, + {211, 29523}, + {212, 29703}, + {213, 29883}, + {214, 30063}, + {215, 30243}, + {216, 30423}, + {217, 30603}, + {218, 30783}, + {219, 30963}, + {220, 31143}, + {221, 31323}, + {222, 31503}, + {223, 31683}, + {224, 31863}, + {225, 32043}, + {226, 32223}, + {227, 32403}, + {228, 32583}, + {229, 32763}, + {230, 32943}, + {231, 33123}, + {232, 33303}, + {233, 33483}, + {234, 33663}, + {235, 33843}, + {236, 34023}, + {237, 34203}, + {238, 34383}, + {239, 34563}, + {240, 34743}, + {241, 34923}, + {242, 35103}, + {243, 35283}, + {244, 35463}, + {245, 35643}, + {246, 35823}, + {247, 36003}, + {248, 36195}, + {249, 36387}, + {250, 36579}, + {251, 36771}, + {252, 36963}, + {253, 37155}, + {254, 37347}, + {255, 37539}, + {256, 37731}, + {257, 37923}, + {258, 38115}, + {259, 38307}, + {260, 38499}, + {261, 38691}, + {262, 38883}, + {265, 39145}, + {266, 39402}, + {267, 39659}, + {268, 39916}, + {269, 40173}, + {270, 40430}, + {271, 40687}, + {272, 40944}, + {273, 41201}, + {274, 41458}, + {275, 41715}, + {276, 41972}, + {277, 42229}, + {278, 42486}, + {279, 42743}, + {280, 43000}, + {281, 43257}, + {282, 43653}, + {283, 44049}, + {284, 44445}, + {285, 44841}, + {286, 45237}, + {287, 45633}, + {288, 46029}, + {289, 46425}, + {290, 46821}, + {291, 47217}, + {292, 47613}, + {293, 48009}, + {294, 48405}, + {295, 48801}, + {296, 49197}, + {299, 49741}, + {342, 51131}, }; GpaPaddedCounterDesc kVkPaddedCounterByGroupGfx8[] = { @@ -1438,7 +1438,6 @@ namespace counter_vk_gfx8 const std::set kHwVkTimestampBlockIdsGfx8 = {342}; ///< Timestamp block id's for VK for gfx8 family const std::set kHwVkTimeCounterIndicesGfx8 = {51131, 51132, 51133, 51134, 51135, 51136}; ///< Timestamp counter indices for VK for gfx8 family const unsigned int kHwVkGroupCountGfx8 = static_cast(kHwVkGroupsGfx8.size()); - const unsigned int kHwVkExposedCountersGroupCountGfx8 = 230; const unsigned int kVkPaddedCounterGroupCountGfx8 = 0; const unsigned int kHwVkSqGroupCountGfx8 = sizeof(kHwVkSqGroupsGfx8) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwVkSqIsolatedGroupCountGfx8 = sizeof(kHwVkSqIsolatedGroupsGfx8) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.h index 301db2df..6fae8c0e 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx8.h @@ -39,7 +39,6 @@ namespace counter_vk_gfx8 extern const std::set kHwVkTimestampBlockIdsGfx8; ///< Timestamp block id's for Vk for Gfx8 family extern const std::set kHwVkTimeCounterIndicesGfx8; ///< Timestamp counter indices for Vk for Gfx8 family extern const unsigned int kHwVkGroupCountGfx8; ///< Hardware Group Count for Vk for Gfx8 family - extern const unsigned int kHwVkExposedCountersGroupCountGfx8; ///< Exposed hardware counter Group Count for Vk for Gfx8 family extern const unsigned int kVkPaddedCounterGroupCountGfx8; ///< reserved counter group count for Vk for Gfx8 family extern const unsigned int kHwVkSqGroupCountGfx8; ///< Hardware SQ Group Count for Vk for Gfx8 family extern const unsigned int kHwVkSqIsolatedGroupCountGfx8; ///< Hardware Isolated Group Count for Vk for Gfx8 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.cc index 0ce8ce01..aefdf58c 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.cc @@ -674,269 +674,269 @@ namespace counter_vk_gfx9 }; GpaCounterGroupExposedCounterDesc kHwVkExposedCountersByGroupGfx9[] = { - {0, 0, {0, 23}}, - {3, 96, {1, 9, 105, 114, 125, 146}}, - {4, 244, {1, 9, 105, 114, 125, 146}}, - {5, 392, {1, 9, 105, 114, 125, 146}}, - {6, 540, {1, 9, 105, 114, 125, 146}}, - {7, 688, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {8, 1039, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {9, 1390, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {10, 1741, {8, 14, 21, 54, 55, 56, 57, 61, 62, 73, 74, 105, 109}}, - {11, 2092, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {12, 2584, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {13, 3076, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {14, 3568, {159, 160, 161, 162, 235, 236, 237, 238, 259}}, - {15, 4060, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {16, 4256, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {17, 4452, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {18, 4648, {1, 10, 20, 23, 32, 38, 42, 43, 46, 48, 49, 52, 54, 59}}, - {19, 4844, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {20, 5218, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {21, 5592, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {22, 5966, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {23, 6340, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {24, 6714, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {25, 7088, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {26, 7462, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {27, 7836, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {28, 8210, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {29, 8584, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {30, 8958, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {31, 9332, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {32, 9706, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {33, 10080, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {34, 10454, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {35, 10828, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {36, 11202, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {37, 11576, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {38, 11950, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {39, 12324, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {40, 12698, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {41, 13072, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {42, 13446, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {43, 13820, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {44, 14194, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {45, 14568, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {46, 14942, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {47, 15316, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {48, 15690, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {49, 16064, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {50, 16438, {4, 14, 26, 27, 28, 30, 31, 32, 33, 34, 35, 63, 71, 84, 85, 93}}, - {51, 16812, {12, 14, 17, 19, 22, 24, 27, 29}}, - {52, 17020, {12, 14, 17, 19, 22, 24, 27, 29}}, - {53, 17228, {12, 14, 17, 19, 22, 24, 27, 29}}, - {54, 17436, {12, 14, 17, 19, 22, 24, 27, 29}}, - {55, 17644, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {56, 17763, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {57, 17882, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {58, 18001, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {59, 18120, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {60, 18239, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {61, 18358, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {62, 18477, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {63, 18596, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {64, 18715, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {65, 18834, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {66, 18953, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {67, 19072, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {68, 19191, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {69, 19310, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {70, 19429, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {71, 19548, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {72, 19667, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {73, 19786, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {74, 19905, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {75, 20024, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {76, 20143, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {77, 20262, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {78, 20381, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {79, 20500, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {80, 20619, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {81, 20738, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {82, 20857, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {83, 20976, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {84, 21095, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {85, 21214, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {86, 21333, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {87, 21452, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {88, 21571, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {89, 21690, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {90, 21809, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {91, 21928, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {92, 22047, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {93, 22166, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {94, 22285, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {95, 22404, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {96, 22523, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {97, 22642, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {98, 22761, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {99, 22880, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {100, 22999, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {101, 23118, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {102, 23237, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {103, 23356, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {104, 23475, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {105, 23594, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {106, 23713, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {107, 23832, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {108, 23951, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {109, 24070, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {110, 24189, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {111, 24308, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {112, 24427, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {113, 24546, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {114, 24665, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {115, 24784, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {116, 24903, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {117, 25022, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {118, 25141, {15, 68, 69, 70, 71, 89, 90, 91, 92, 93, 94, 95, 96, 97, 101, 102}}, - {183, 28908, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {184, 28993, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {185, 29078, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {186, 29163, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {187, 29248, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {188, 29333, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {189, 29418, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {190, 29503, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {191, 29588, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {192, 29673, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {193, 29758, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {194, 29843, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {195, 29928, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {196, 30013, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {197, 30098, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {198, 30183, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {199, 30268, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {200, 30353, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {201, 30438, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {202, 30523, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {203, 30608, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {204, 30693, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {205, 30778, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {206, 30863, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {207, 30948, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {208, 31033, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {209, 31118, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {210, 31203, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {211, 31288, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {212, 31373, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {213, 31458, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {214, 31543, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {215, 31628, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {216, 31713, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {217, 31798, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {218, 31883, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {219, 31968, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {220, 32053, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {221, 32138, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {222, 32223, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {223, 32308, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {224, 32393, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {225, 32478, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {226, 32563, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {227, 32648, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {228, 32733, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {229, 32818, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {230, 32903, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {231, 32988, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {232, 33073, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {233, 33158, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {234, 33243, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {235, 33328, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {236, 33413, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {237, 33498, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {238, 33583, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {239, 33668, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {240, 33753, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {241, 33838, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {242, 33923, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {243, 34008, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {244, 34093, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {245, 34178, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {246, 34263, {6, 11, 12, 13, 60, 69, 70, 71, 72}}, - {247, 34348, {20, 22, 29, 30, 33, 41, 42}}, - {248, 34630, {20, 22, 29, 30, 33, 41, 42}}, - {249, 34912, {20, 22, 29, 30, 33, 41, 42}}, - {250, 35194, {20, 22, 29, 30, 33, 41, 42}}, - {251, 35476, {20, 22, 29, 30, 33, 41, 42}}, - {252, 35758, {20, 22, 29, 30, 33, 41, 42}}, - {253, 36040, {20, 22, 29, 30, 33, 41, 42}}, - {254, 36322, {20, 22, 29, 30, 33, 41, 42}}, - {255, 36604, {20, 22, 29, 30, 33, 41, 42}}, - {256, 36886, {20, 22, 29, 30, 33, 41, 42}}, - {257, 37168, {20, 22, 29, 30, 33, 41, 42}}, - {258, 37450, {20, 22, 29, 30, 33, 41, 42}}, - {259, 37732, {20, 22, 29, 30, 33, 41, 42}}, - {260, 38014, {20, 22, 29, 30, 33, 41, 42}}, - {261, 38296, {20, 22, 29, 30, 33, 41, 42}}, - {262, 38578, {20, 22, 29, 30, 33, 41, 42}}, - {265, 38930, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {266, 39258, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {267, 39586, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {268, 39914, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {269, 40242, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {270, 40570, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {271, 40898, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {272, 41226, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {273, 41554, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {274, 41882, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {275, 42210, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {276, 42538, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {277, 42866, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {278, 43194, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {279, 43522, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {280, 43850, {4, 15, 28, 46, 48, 55, 60, 63, 144, 174, 175, 176, 177, 178, 179}}, - {281, 44178, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {282, 44622, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {283, 45066, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {284, 45510, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {285, 45954, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {286, 46398, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {287, 46842, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {288, 47286, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {289, 47730, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {290, 48174, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {291, 48618, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {292, 49062, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {293, 49506, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {294, 49950, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {295, 50394, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {296, 50838, {7, 116, 117, 118, 126, 127, 128, 162, 257, 259}}, - {298, 51403, {0, 2}}, - {312, 51912, {55, 57}}, - {313, 51995, {55, 57}}, - {314, 52078, {55, 57}}, - {315, 52161, {55, 57}}, - {316, 52244, {55, 57}}, - {317, 52327, {55, 57}}, - {318, 52410, {55, 57}}, - {319, 52493, {55, 57}}, - {320, 52576, {55, 57}}, - {321, 52659, {55, 57}}, - {322, 52742, {55, 57}}, - {323, 52825, {55, 57}}, - {324, 52908, {55, 57}}, - {325, 52991, {55, 57}}, - {326, 53074, {55, 57}}, - {327, 53157, {55, 57}}, - {328, 53240, {55, 57}}, - {329, 53323, {55, 57}}, - {330, 53406, {55, 57}}, - {331, 53489, {55, 57}}, - {332, 53572, {55, 57}}, - {333, 53655, {55, 57}}, - {334, 53738, {55, 57}}, - {335, 53821, {55, 57}}, - {336, 53904, {55, 57}}, - {337, 53987, {55, 57}}, - {338, 54070, {55, 57}}, - {339, 54153, {55, 57}}, - {340, 54236, {55, 57}}, - {341, 54319, {55, 57}}, - {342, 54402, {55, 57}}, - {343, 54485, {55, 57}}, - {385, 57999, {0, 1, 2, 3, 4, 5}}, + {0, 0}, + {3, 96}, + {4, 244}, + {5, 392}, + {6, 540}, + {7, 688}, + {8, 1039}, + {9, 1390}, + {10, 1741}, + {11, 2092}, + {12, 2584}, + {13, 3076}, + {14, 3568}, + {15, 4060}, + {16, 4256}, + {17, 4452}, + {18, 4648}, + {19, 4844}, + {20, 5218}, + {21, 5592}, + {22, 5966}, + {23, 6340}, + {24, 6714}, + {25, 7088}, + {26, 7462}, + {27, 7836}, + {28, 8210}, + {29, 8584}, + {30, 8958}, + {31, 9332}, + {32, 9706}, + {33, 10080}, + {34, 10454}, + {35, 10828}, + {36, 11202}, + {37, 11576}, + {38, 11950}, + {39, 12324}, + {40, 12698}, + {41, 13072}, + {42, 13446}, + {43, 13820}, + {44, 14194}, + {45, 14568}, + {46, 14942}, + {47, 15316}, + {48, 15690}, + {49, 16064}, + {50, 16438}, + {51, 16812}, + {52, 17020}, + {53, 17228}, + {54, 17436}, + {55, 17644}, + {56, 17763}, + {57, 17882}, + {58, 18001}, + {59, 18120}, + {60, 18239}, + {61, 18358}, + {62, 18477}, + {63, 18596}, + {64, 18715}, + {65, 18834}, + {66, 18953}, + {67, 19072}, + {68, 19191}, + {69, 19310}, + {70, 19429}, + {71, 19548}, + {72, 19667}, + {73, 19786}, + {74, 19905}, + {75, 20024}, + {76, 20143}, + {77, 20262}, + {78, 20381}, + {79, 20500}, + {80, 20619}, + {81, 20738}, + {82, 20857}, + {83, 20976}, + {84, 21095}, + {85, 21214}, + {86, 21333}, + {87, 21452}, + {88, 21571}, + {89, 21690}, + {90, 21809}, + {91, 21928}, + {92, 22047}, + {93, 22166}, + {94, 22285}, + {95, 22404}, + {96, 22523}, + {97, 22642}, + {98, 22761}, + {99, 22880}, + {100, 22999}, + {101, 23118}, + {102, 23237}, + {103, 23356}, + {104, 23475}, + {105, 23594}, + {106, 23713}, + {107, 23832}, + {108, 23951}, + {109, 24070}, + {110, 24189}, + {111, 24308}, + {112, 24427}, + {113, 24546}, + {114, 24665}, + {115, 24784}, + {116, 24903}, + {117, 25022}, + {118, 25141}, + {183, 28908}, + {184, 28993}, + {185, 29078}, + {186, 29163}, + {187, 29248}, + {188, 29333}, + {189, 29418}, + {190, 29503}, + {191, 29588}, + {192, 29673}, + {193, 29758}, + {194, 29843}, + {195, 29928}, + {196, 30013}, + {197, 30098}, + {198, 30183}, + {199, 30268}, + {200, 30353}, + {201, 30438}, + {202, 30523}, + {203, 30608}, + {204, 30693}, + {205, 30778}, + {206, 30863}, + {207, 30948}, + {208, 31033}, + {209, 31118}, + {210, 31203}, + {211, 31288}, + {212, 31373}, + {213, 31458}, + {214, 31543}, + {215, 31628}, + {216, 31713}, + {217, 31798}, + {218, 31883}, + {219, 31968}, + {220, 32053}, + {221, 32138}, + {222, 32223}, + {223, 32308}, + {224, 32393}, + {225, 32478}, + {226, 32563}, + {227, 32648}, + {228, 32733}, + {229, 32818}, + {230, 32903}, + {231, 32988}, + {232, 33073}, + {233, 33158}, + {234, 33243}, + {235, 33328}, + {236, 33413}, + {237, 33498}, + {238, 33583}, + {239, 33668}, + {240, 33753}, + {241, 33838}, + {242, 33923}, + {243, 34008}, + {244, 34093}, + {245, 34178}, + {246, 34263}, + {247, 34348}, + {248, 34630}, + {249, 34912}, + {250, 35194}, + {251, 35476}, + {252, 35758}, + {253, 36040}, + {254, 36322}, + {255, 36604}, + {256, 36886}, + {257, 37168}, + {258, 37450}, + {259, 37732}, + {260, 38014}, + {261, 38296}, + {262, 38578}, + {265, 38930}, + {266, 39258}, + {267, 39586}, + {268, 39914}, + {269, 40242}, + {270, 40570}, + {271, 40898}, + {272, 41226}, + {273, 41554}, + {274, 41882}, + {275, 42210}, + {276, 42538}, + {277, 42866}, + {278, 43194}, + {279, 43522}, + {280, 43850}, + {281, 44178}, + {282, 44622}, + {283, 45066}, + {284, 45510}, + {285, 45954}, + {286, 46398}, + {287, 46842}, + {288, 47286}, + {289, 47730}, + {290, 48174}, + {291, 48618}, + {292, 49062}, + {293, 49506}, + {294, 49950}, + {295, 50394}, + {296, 50838}, + {298, 51403}, + {312, 51912}, + {313, 51995}, + {314, 52078}, + {315, 52161}, + {316, 52244}, + {317, 52327}, + {318, 52410}, + {319, 52493}, + {320, 52576}, + {321, 52659}, + {322, 52742}, + {323, 52825}, + {324, 52908}, + {325, 52991}, + {326, 53074}, + {327, 53157}, + {328, 53240}, + {329, 53323}, + {330, 53406}, + {331, 53489}, + {332, 53572}, + {333, 53655}, + {334, 53738}, + {335, 53821}, + {336, 53904}, + {337, 53987}, + {338, 54070}, + {339, 54153}, + {340, 54236}, + {341, 54319}, + {342, 54402}, + {343, 54485}, + {385, 57999}, }; GpaPaddedCounterDesc kVkPaddedCounterByGroupGfx9[] = { @@ -1662,7 +1662,6 @@ namespace counter_vk_gfx9 const std::set kHwVkTimestampBlockIdsGfx9 = {385}; ///< Timestamp block id's for VK for gfx9 family const std::set kHwVkTimeCounterIndicesGfx9 = {57999, 58000, 58001, 58002, 58003, 58004}; ///< Timestamp counter indices for VK for gfx9 family const unsigned int kHwVkGroupCountGfx9 = static_cast(kHwVkGroupsGfx9.size()); - const unsigned int kHwVkExposedCountersGroupCountGfx9 = 263; const unsigned int kVkPaddedCounterGroupCountGfx9 = 73; const unsigned int kHwVkSqGroupCountGfx9 = sizeof(kHwVkSqGroupsGfx9) / sizeof(GpaSqCounterGroupDesc); const unsigned int kHwVkSqIsolatedGroupCountGfx9 = sizeof(kHwVkSqIsolatedGroupsGfx9) / sizeof(unsigned int); diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.h b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.h index 6258b90c..bb4ebbf7 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.h +++ b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter_vk_gfx9.h @@ -39,7 +39,6 @@ namespace counter_vk_gfx9 extern const std::set kHwVkTimestampBlockIdsGfx9; ///< Timestamp block id's for Vk for Gfx9 family extern const std::set kHwVkTimeCounterIndicesGfx9; ///< Timestamp counter indices for Vk for Gfx9 family extern const unsigned int kHwVkGroupCountGfx9; ///< Hardware Group Count for Vk for Gfx9 family - extern const unsigned int kHwVkExposedCountersGroupCountGfx9; ///< Exposed hardware counter Group Count for Vk for Gfx9 family extern const unsigned int kVkPaddedCounterGroupCountGfx9; ///< reserved counter group count for Vk for Gfx9 family extern const unsigned int kHwVkSqGroupCountGfx9; ///< Hardware SQ Group Count for Vk for Gfx9 family extern const unsigned int kHwVkSqIsolatedGroupCountGfx9; ///< Hardware Isolated Group Count for Vk for Gfx9 family diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_cl.cmake b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_cl.cmake index 4be53f75..1d566074 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_cl.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_cl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_DEF_HEADERS_CL diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx11.cmake b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx11.cmake index 4d779177..fa919f56 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx11.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx11.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_DEF_HEADERS_DX11 diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12.cmake b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12.cmake index 22504c4b..9afd2ca9 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_DEF_HEADERS_DX12 diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx103.cc index 0319221e..137f8f20 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx103.cc @@ -6000,8 +6000,8 @@ internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", "ede3305e-abd4 internal_counters.push_back(84606); internal_counters.push_back(84696); - c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, -internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", "2a601145-56c1-625b-bedd-66d959c5ecc3"); + c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, +internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", "48207266-a1ef-290a-3c77-effd1260fa2c"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx11.cc index 460f36c4..e8fc9371 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_dx12_gfx11.cc @@ -7902,8 +7902,8 @@ internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,2 internal_counters.push_back(91007); internal_counters.push_back(91105); - c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, -internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "2a601145-56c1-625b-bedd-66d959c5ecc3"); + c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, +internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "48207266-a1ef-290a-3c77-effd1260fa2c"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl.cmake b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl.cmake index 13797590..653e3fe2 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_DEF_HEADERS_GL diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx10.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx10.cc index 299512c9..225199e8 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx10.cc @@ -2023,7 +2023,7 @@ void AutoDefinePublicDerivedCountersGlGfx10(GpaDerivedCounters& c) internal_counters.push_back(12629); internal_counters.push_back(12855); - c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", "168f077c-4797-b2f5-717f-105c725266c8"); + c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ARRAYS,/", "168f077c-4797-b2f5-717f-105c725266c8"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx103.cc index af3442cb..458777ec 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx103.cc @@ -1767,7 +1767,7 @@ void AutoDefinePublicDerivedCountersGlGfx103(GpaDerivedCounters& c) internal_counters.push_back(12886); internal_counters.push_back(13122); - c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", "168f077c-4797-b2f5-717f-105c725266c8"); + c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ARRAYS,/", "168f077c-4797-b2f5-717f-105c725266c8"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx8.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx8.cc index 5facad50..8b38a876 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx8.cc @@ -1862,7 +1862,7 @@ void AutoDefinePublicDerivedCountersGlGfx8(GpaDerivedCounters& c) internal_counters.push_back(7534); internal_counters.push_back(7653); - c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", "168f077c-4797-b2f5-717f-105c725266c8"); + c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ENGINES,/", "168f077c-4797-b2f5-717f-105c725266c8"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx9.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx9.cc index cc256395..9fc4b5b5 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_gl_gfx9.cc @@ -2048,7 +2048,7 @@ void AutoDefinePublicDerivedCountersGlGfx9(GpaDerivedCounters& c) internal_counters.push_back(9094); internal_counters.push_back(9213); - c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", "168f077c-4797-b2f5-717f-105c725266c8"); + c.DefineDerivedCounter("MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", kGpaDataTypeFloat64, kGpaUsageTypeCycles, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ENGINES,/", "168f077c-4797-b2f5-717f-105c725266c8"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_oglp_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_oglp_gfx11.cc index 1d1cbbb5..95e6bf22 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_oglp_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_oglp_gfx11.cc @@ -7709,7 +7709,7 @@ void AutoDefinePublicDerivedCountersOglpGfx11(GpaDerivedCounters& c) internal_counters.push_back(91007); internal_counters.push_back(91105); - c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "2a601145-56c1-625b-bedd-66d959c5ecc3"); + c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "48207266-a1ef-290a-3c77-effd1260fa2c"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk.cmake b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk.cmake index 5b647a1d..398e3928 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk.cmake +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_DEF_HEADERS_VK diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx103.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx103.cc index 94af0149..2f4142a2 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx103.cc @@ -5873,7 +5873,7 @@ void AutoDefinePublicDerivedCountersVkGfx103(GpaDerivedCounters& c) internal_counters.push_back(84606); internal_counters.push_back(84696); - c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", "2a601145-56c1-625b-bedd-66d959c5ecc3"); + c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", "48207266-a1ef-290a-3c77-effd1260fa2c"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx11.cc b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx11.cc index 717bb3a1..7aaaf48a 100644 --- a/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_counter_generator/public_counter_definitions_vk_gfx11.cc @@ -7780,7 +7780,7 @@ void AutoDefinePublicDerivedCountersVkGfx11(GpaDerivedCounters& c) internal_counters.push_back(91007); internal_counters.push_back(91105); - c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "2a601145-56c1-625b-bedd-66d959c5ecc3"); + c.DefineDerivedCounter("LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", kGpaDataTypeFloat64, kGpaUsageTypeBytes, internal_counters, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", "48207266-a1ef-290a-3c77-effd1260fa2c"); } { vector internal_counters; diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_cl.cmake b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_cl.cmake index 14f9e031..2c114896 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_cl.cmake +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_cl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_DERIVED_COUNTERS_API_HEADERS_CL diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx11.cmake b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx11.cmake index 7c8a10ea..3c259d19 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx11.cmake +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx11.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_DERIVED_COUNTERS_API_HEADERS_DX11 diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12.cmake b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12.cmake index 91b55e20..900eb322 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12.cmake +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_DERIVED_COUNTERS_API_HEADERS_DX12 diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx103.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx103.cc index b901f1f4..c8b9fd2d 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx103.cc @@ -137,7 +137,7 @@ const GpaCounterDesc kDx12Gfx103PublicCounters[kDx12Gfx103PublicCounterCount] = {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,max80", 80, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, {"WriteUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the Write unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0xede3305e, 0xabd4, 0xd6bf, {0x6b, 0x00, 0xff, 0xc5, 0x7a, 0x29, 0xfc, 0xe3}}}, - {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x2a601145, 0x56c1, 0x625b, {0xbe, 0xdd, 0x66, 0xd9, 0x59, 0xc5, 0xec, 0xc3}}}, + {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x48207266, 0xa1ef, 0x290a, {0x3c, 0x77, 0xef, 0xfd, 0x12, 0x60, 0xfa, 0x2c}}}, {"PcieBytes", "GlobalMemory", "Number of bytes sent and received over the PCIe bus", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x4bbe92de, 0xf79e, 0xed39, {0xbf, 0xde, 0x9e, 0x08, 0x39, 0x0c, 0xdb, 0x21}}}, {"RayTriTests", "RayTracing", "The number of ray triangle intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,sum80", 80, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x20c646f5, 0xfa99, 0x51c2, {0xb5, 0x83, 0x0a, 0x3d, 0x77, 0xd6, 0x75, 0xa8}}}, {"RayBoxTests", "RayTracing", "The number of ray box intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,sum80,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,sum80,sum2", 160, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x7769ceee, 0x824d, 0xb84a, {0x87, 0x79, 0xbb, 0x3f, 0x8e, 0x44, 0x95, 0x82}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx11.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx11.cc index 3c93c338..be3b3e3b 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_dx12_gfx11.cc @@ -132,7 +132,7 @@ const GpaCounterDesc kDx12Gfx11PublicCounters[kDx12Gfx11PublicCounterCount] = { {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,max96", 96, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24,24,/,(100),*", 25, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, {"WriteUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the Write unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24", 24, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0xede3305e, 0xabd4, 0xd6bf, {0x6b, 0x00, 0xff, 0xc5, 0x7a, 0x29, 0xfc, 0xe3}}}, - {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x2a601145, 0x56c1, 0x625b, {0xbe, 0xdd, 0x66, 0xd9, 0x59, 0xc5, 0xec, 0xc3}}}, + {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x48207266, 0xa1ef, 0x290a, {0x3c, 0x77, 0xef, 0xfd, 0x12, 0x60, 0xfa, 0x2c}}}, {"PcieBytes", "GlobalMemory", "Number of bytes sent and received over the PCIe bus", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x4bbe92de, 0xf79e, 0xed39, {0xbf, 0xde, 0x9e, 0x08, 0x39, 0x0c, 0xdb, 0x21}}}, {"RayTriTests", "RayTracing", "The number of ray triangle intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,sum96", 96, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x20c646f5, 0xfa99, 0x51c2, {0xb5, 0x83, 0x0a, 0x3d, 0x77, 0xd6, 0x75, 0xa8}}}, {"RayBoxTests", "RayTracing", "The number of ray box intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,sum96,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,sum96,sum2", 192, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x7769ceee, 0x824d, 0xb84a, {0x87, 0x79, 0xbb, 0x3f, 0x8e, 0x44, 0x95, 0x82}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl.cmake b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl.cmake index 098bd191..ba3a135f 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl.cmake +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_DERIVED_COUNTERS_API_HEADERS_GL diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx10.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx10.cc index ebd93ffd..336f8e57 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx10.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx10.cc @@ -155,7 +155,7 @@ const GpaCounterDesc kGlGfx10PublicCounters[kGlGfx10PublicCounterCount] = { {"FetchSize", "GlobalMemory", "The total bytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,(64),*,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,sum16,(96),*,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,sum16,(128),*,sum4", 64, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x664bb3ef, 0x6eca, 0x86b1, {0x1e, 0x2d, 0x30, 0xcb, 0x89, 0x7b, 0x5f, 0xa9}}}, {"WriteSize", "GlobalMemory", "The total bytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,-,(32),*,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,(64),*,+", 32, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0xf96f2c16, 0xb1b4, 0x4ec4, {0x22, 0x9c, 0xfc, 0x82, 0xe6, 0xf8, 0x0a, 0x82}}}, {"MemUnitBusy", "GlobalMemory", "The percentage of GPUTime the memory unit is active. The result includes the stall time (MemUnitStalled). This is measured with all extra fetches and writes and any cache or memory effects taken into account. Value range: 0% to 100% (fetch-bound).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ARRAYS,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0xa1efa380, 0x4a72, 0xe066, {0xe0, 0x6a, 0x2a, 0xb7, 0x1a, 0x48, 0x85, 0x21}}}, - {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, + {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ARRAYS,/", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, {"MemUnitStalled", "GlobalMemory", "The percentage of GPUTime the memory unit is stalled. Try reducing the number or size of fetches and writes if possible. Value range: 0% (optimal) to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ARRAYS,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x465ba54f, 0xd250, 0x1453, {0x79, 0x0a, 0x73, 0x1b, 0x10, 0xd2, 0x30, 0xb1}}}, {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,max10", 10, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx103.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx103.cc index 9d51a2a9..ca4a3574 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx103.cc @@ -121,7 +121,7 @@ const GpaCounterDesc kGlGfx103PublicCounters[kGlGfx103PublicCounterCount] = { {"FetchSize", "GlobalMemory", "The total bytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,(64),*,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,sum16,(96),*,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,sum16,(128),*,sum4", 64, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x664bb3ef, 0x6eca, 0x86b1, {0x1e, 0x2d, 0x30, 0xcb, 0x89, 0x7b, 0x5f, 0xa9}}}, {"WriteSize", "GlobalMemory", "The total bytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,-,(32),*,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,sum16,(64),*,+", 32, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0xf96f2c16, 0xb1b4, 0x4ec4, {0x22, 0x9c, 0xfc, 0x82, 0xe6, 0xf8, 0x0a, 0x82}}}, {"MemUnitBusy", "GlobalMemory", "The percentage of GPUTime the memory unit is active. The result includes the stall time (MemUnitStalled). This is measured with all extra fetches and writes and any cache or memory effects taken into account. Value range: 0% to 100% (fetch-bound).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ARRAYS,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0xa1efa380, 0x4a72, 0xe066, {0xe0, 0x6a, 0x2a, 0xb7, 0x1a, 0x48, 0x85, 0x21}}}, - {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, + {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ARRAYS,/", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, {"MemUnitStalled", "GlobalMemory", "The percentage of GPUTime the memory unit is stalled. Try reducing the number or size of fetches and writes if possible. Value range: 0% (optimal) to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ARRAYS,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x465ba54f, 0xd250, 0x1453, {0x79, 0x0a, 0x73, 0x1b, 0x10, 0xd2, 0x30, 0xb1}}}, {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,max10", 10, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx8.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx8.cc index 7dc3edc4..6a43764a 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx8.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx8.cc @@ -157,7 +157,7 @@ const GpaCounterDesc kGlGfx8PublicCounters[kGlGfx8PublicCounterCount] = { {"CacheHitCount", "GlobalMemory", "Count of fetch, write, atomic, and other instructions that hit the data cache.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16", 16, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x43437652, 0x1024, 0x9737, {0x2e, 0xb0, 0x08, 0x99, 0xc0, 0xc1, 0xfe, 0xae}}}, {"CacheMissCount", "GlobalMemory", "Count of fetch, write, atomic, and other instructions that miss the data cache.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16", 16, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0xd0f8a812, 0xf41b, 0x644f, {0x09, 0xd1, 0x14, 0xee, 0x03, 0xea, 0x36, 0x71}}}, {"MemUnitBusy", "GlobalMemory", "The percentage of GPUTime the memory unit is active. The result includes the stall time (MemUnitStalled). This is measured with all extra fetches and writes and any cache or memory effects taken into account. Value range: 0% to 100% (fetch-bound).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ENGINES,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0xa1efa380, 0x4a72, 0xe066, {0xe0, 0x6a, 0x2a, 0xb7, 0x1a, 0x48, 0x85, 0x21}}}, - {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, + {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ENGINES,/", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, {"MemUnitStalled", "GlobalMemory", "The percentage of GPUTime the memory unit is stalled. Try reducing the number or size of fetches and writes if possible. Value range: 0% (optimal) to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ENGINES,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x465ba54f, 0xd250, 0x1453, {0x79, 0x0a, 0x73, 0x1b, 0x10, 0xd2, 0x30, 0xb1}}}, {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx9.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx9.cc index 631751d1..a46ece47 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx9.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_gl_gfx9.cc @@ -151,7 +151,7 @@ const GpaCounterDesc kGlGfx9PublicCounters[kGlGfx9PublicCounterCount] = { {"L2CacheHitCount", "GlobalMemory", "Count of fetch, write, atomic, and other instructions that hit the L2 cache.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16", 16, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0xd0bce171, 0x560c, 0x1895, {0x66, 0xb3, 0xbc, 0x56, 0xab, 0xcc, 0xb0, 0x77}}}, {"L2CacheMissCount", "GlobalMemory", "Count of fetch, write, atomic, and other instructions that miss the L2 cache.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16", 16, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0xf2ab3a1a, 0xead6, 0x9893, {0x96, 0x1b, 0x88, 0xba, 0x2a, 0x75, 0x88, 0x07}}}, {"MemUnitBusy", "GlobalMemory", "The percentage of GPUTime the memory unit is active. The result includes the stall time (MemUnitStalled). This is measured with all extra fetches and writes and any cache or memory effects taken into account. Value range: 0% to 100% (fetch-bound).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ENGINES,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0xa1efa380, 0x4a72, 0xe066, {0xe0, 0x6a, 0x2a, 0xb7, 0x1a, 0x48, 0x85, 0x21}}}, - {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, + {"MemUnitBusyCycles", "GlobalMemory", "Number of GPU cycles the memory unit is active. The result includes the stall time (MemUnitStalledCycles). This is measured with all extra fetches and writes and any cache or memory effects taken into account.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,NUM_SHADER_ENGINES,/", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x168f077c, 0x4797, 0xb2f5, {0x71, 0x7f, 0x10, 0x5c, 0x72, 0x52, 0x66, 0xc8}}}, {"MemUnitStalled", "GlobalMemory", "The percentage of GPUTime the memory unit is stalled. Try reducing the number or size of fetches and writes if possible. Value range: 0% (optimal) to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,NUM_SHADER_ENGINES,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x465ba54f, 0xd250, 0x1453, {0x79, 0x0a, 0x73, 0x1b, 0x10, 0xd2, 0x30, 0xb1}}}, {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_oglp_gfx11.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_oglp_gfx11.cc index a73c2e3e..61a80273 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_oglp_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_oglp_gfx11.cc @@ -128,6 +128,6 @@ const GpaCounterDesc kOglpGfx11PublicCounters[kOglpGfx11PublicCounterCount] = { {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,max96", 96, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24,24,/,(100),*", 25, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, {"WriteUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the Write unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24", 24, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0xede3305e, 0xabd4, 0xd6bf, {0x6b, 0x00, 0xff, 0xc5, 0x7a, 0x29, 0xfc, 0xe3}}}, - {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x2a601145, 0x56c1, 0x625b, {0xbe, 0xdd, 0x66, 0xd9, 0x59, 0xc5, 0xec, 0xc3}}}, + {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x48207266, 0xa1ef, 0x290a, {0x3c, 0x77, 0xef, 0xfd, 0x12, 0x60, 0xfa, 0x2c}}}, {"PcieBytes", "GlobalMemory", "Number of bytes sent and received over the PCIe bus", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x4bbe92de, 0xf79e, 0xed39, {0xbf, 0xde, 0x9e, 0x08, 0x39, 0x0c, 0xdb, 0x21}}}, }; diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk.cmake b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk.cmake index 521e13ff..e5cc536f 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk.cmake +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_DERIVED_COUNTERS_API_HEADERS_VK diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx103.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx103.cc index f4226a0d..e638f194 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx103.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx103.cc @@ -137,7 +137,7 @@ const GpaCounterDesc kVkGfx103PublicCounters[kVkGfx103PublicCounterCount] = { {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,max80", 80, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16,16,/,(100),*", 17, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, {"WriteUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the Write unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,max16", 16, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0xede3305e, 0xabd4, 0xd6bf, {0x6b, 0x00, 0xff, 0xc5, 0x7a, 0x29, 0xfc, 0xe3}}}, - {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x2a601145, 0x56c1, 0x625b, {0xbe, 0xdd, 0x66, 0xd9, 0x59, 0xc5, 0xec, 0xc3}}}, + {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x48207266, 0xa1ef, 0x290a, {0x3c, 0x77, 0xef, 0xfd, 0x12, 0x60, 0xfa, 0x2c}}}, {"PcieBytes", "GlobalMemory", "Number of bytes sent and received over the PCIe bus", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,sum16,(32),*", 16, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x4bbe92de, 0xf79e, 0xed39, {0xbf, 0xde, 0x9e, 0x08, 0x39, 0x0c, 0xdb, 0x21}}}, {"RayTriTests", "RayTracing", "The number of ray triangle intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,sum80", 80, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x20c646f5, 0xfa99, 0x51c2, {0xb5, 0x83, 0x0a, 0x3d, 0x77, 0xd6, 0x75, 0xa8}}}, {"RayBoxTests", "RayTracing", "The number of ray box intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,sum80,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,sum80,sum2", 160, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x7769ceee, 0x824d, 0xb84a, {0x87, 0x79, 0xbb, 0x3f, 0x8e, 0x44, 0x95, 0x82}}}, diff --git a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx11.cc b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx11.cc index c13ddaac..c5d399b8 100644 --- a/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx11.cc +++ b/source/auto_generated/gpu_perf_api_unit_tests/counters/public_derived_counters_vk_gfx11.cc @@ -132,7 +132,7 @@ const GpaCounterDesc kVkGfx11PublicCounters[kVkGfx11PublicCounterCount] = { {"MemUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the memory unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,max96", 96, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0x2745659a, 0x0e40, 0xbace, {0x3b, 0x9b, 0x86, 0xa5, 0x4f, 0x8e, 0x46, 0x23}}}, {"WriteUnitStalled", "GlobalMemory", "The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24,24,/,(100),*", 25, kGpaDataTypeFloat64, kGpaUsageTypePercentage, {0x594ad3ce, 0xd1ec, 0x10fc, {0x7d, 0x59, 0x25, 0x73, 0x8e, 0x39, 0x7d, 0x72}}}, {"WriteUnitStalledCycles", "GlobalMemory", "Number of GPU cycles the Write unit is stalled.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,max24", 24, kGpaDataTypeFloat64, kGpaUsageTypeCycles, {0xede3305e, 0xabd4, 0xd6bf, {0x6b, 0x00, 0xff, 0xc5, 0x7a, 0x29, 0xfc, 0xe3}}}, - {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x2a601145, 0x56c1, 0x625b, {0xbe, 0xdd, 0x66, 0xd9, 0x59, 0xc5, 0xec, 0xc3}}}, + {"LocalVidMemBytes", "GlobalMemory", "Number of bytes read from or written to the Infinity Cache (if available) or local video memory", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x48207266, 0xa1ef, 0x290a, {0x3c, 0x77, 0xef, 0xfd, 0x12, 0x60, 0xfa, 0x2c}}}, {"PcieBytes", "GlobalMemory", "Number of bytes sent and received over the PCIe bus", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,sum24,(32),*", 24, kGpaDataTypeFloat64, kGpaUsageTypeBytes, {0x4bbe92de, 0xf79e, 0xed39, {0xbf, 0xde, 0x9e, 0x08, 0x39, 0x0c, 0xdb, 0x21}}}, {"RayTriTests", "RayTracing", "The number of ray triangle intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,sum96", 96, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x20c646f5, 0xfa99, 0x51c2, {0xb5, 0x83, 0x0a, 0x3d, 0x77, 0xd6, 0x75, 0xa8}}}, {"RayBoxTests", "RayTracing", "The number of ray box intersection tests.", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,sum96,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,sum96,sum2", 192, kGpaDataTypeFloat64, kGpaUsageTypeItems, {0x7769ceee, 0x824d, 0xb84a, {0x87, 0x79, 0xbb, 0x3f, 0x8e, 0x44, 0x95, 0x82}}}, diff --git a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_cl.cmake b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_cl.cmake index 6b8cfb47..a36f96ed 100644 --- a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_cl.cmake +++ b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_cl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_NAMES_CL diff --git a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx11.cmake b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx11.cmake index 838ccedb..9f892e72 100644 --- a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx11.cmake +++ b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx11.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_NAMES_DX11 diff --git a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx12.cmake b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx12.cmake index 7b99ecb6..3247477d 100644 --- a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx12.cmake +++ b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_dx12.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_NAMES_DX12 diff --git a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_gl.cmake b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_gl.cmake index 51698a94..38858604 100644 --- a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_gl.cmake +++ b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_gl.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_NAMES_GL diff --git a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_vk.cmake b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_vk.cmake index 7fa15e18..af2507a8 100644 --- a/source/auto_generated/public_counter_compiler_input_files/public_counter_names_vk.cmake +++ b/source/auto_generated/public_counter_compiler_input_files/public_counter_names_vk.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(PUBLIC_COUNTER_NAMES_VK diff --git a/source/examples/dx11/dx11_triangle/CMakeLists.txt b/source/examples/dx11/dx11_triangle/CMakeLists.txt index ceb90989..c789d47b 100644 --- a/source/examples/dx11/dx11_triangle/CMakeLists.txt +++ b/source/examples/dx11/dx11_triangle/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../../../") diff --git a/source/examples/dx12/dx12_color_cube/CMakeLists.txt b/source/examples/dx12/dx12_color_cube/CMakeLists.txt index 2e500e0d..f340e1c7 100644 --- a/source/examples/dx12/dx12_color_cube/CMakeLists.txt +++ b/source/examples/dx12/dx12_color_cube/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../../../") diff --git a/source/examples/dx12/dx12_color_cube/cube_sample.cc b/source/examples/dx12/dx12_color_cube/cube_sample.cc index 299fc56d..35420dda 100644 --- a/source/examples/dx12/dx12_color_cube/cube_sample.cc +++ b/source/examples/dx12/dx12_color_cube/cube_sample.cc @@ -2575,7 +2575,7 @@ bool CubeSample::GpaValidateDataGfx8(unsigned int profile_set, else if (0 == local_counter_name.compare("L2CacheRequestCount") || 0 == local_counter_name.compare("L2CacheHitCount") || 0 == local_counter_name.compare("L2CacheMissCount")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0) && + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0) && GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 3000); } else if (0 == local_counter_name.compare("PostZQuads")) @@ -2928,7 +2928,7 @@ bool CubeSample::GpaValidateDataGfx9(unsigned int profile_set, else if (0 == local_counter_name.compare("L2CacheRequestCount") || 0 == local_counter_name.compare("L2CacheHitCount") || 0 == local_counter_name.compare("L2CacheMissCount")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0) && + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0) && GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 5500); } else if (0 == local_counter_name.compare("WriteUnitStalled")) @@ -3377,15 +3377,15 @@ bool CubeSample::GpaValidateDataGfx10(unsigned int profile_set, } else if (0 == local_counter_name.compare("InstCacheRequestCount")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 1, 52000); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 1, 300000); } else if (0 == local_counter_name.compare("InstCacheHitCount") || 0 == local_counter_name.compare("InstCacheMissCount")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0, 52000); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0, 300000); } else if (0 == local_counter_name.compare("L1CacheRequestCount") || 0 == local_counter_name.compare("L1CacheMissCount")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 10) && + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0) && GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 3000); } else if (0 == local_counter_name.compare("L2CacheRequestCount") || 0 == local_counter_name.compare("L2CacheHitCount") || @@ -3405,7 +3405,8 @@ bool CubeSample::GpaValidateDataGfx10(unsigned int profile_set, } else if (0 == local_counter_name.compare("WriteUnitStalled") || 0 == local_counter_name.compare("WriteUnitStalledCycles")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0) && + GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 40); } else if (app_->IncludeKnownIssues() && 0 == local_counter_name.compare("GPUBusyCycles")) { @@ -4164,11 +4165,11 @@ bool CubeSample::GpaValidateDataGfx11(unsigned int profile_set, } else if (0 == local_counter_name.compare("WriteUnitStalled")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThanOrEqualTo, 22); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThanOrEqualTo, 24); } else if (0 == local_counter_name.compare("WriteUnitStalledCycles")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThanOrEqualTo, 3600); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThanOrEqualTo, 3700); } else if (0 == local_counter_name.compare("MemUnitStalled")) { @@ -4181,7 +4182,7 @@ bool CubeSample::GpaValidateDataGfx11(unsigned int profile_set, else if (0 == local_counter_name.compare("GPUBusyCycles")) { return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 8000) && - GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 32000); + GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeLessThan, 35000); } else if (0 == local_counter_name.compare("CBMemRead") || 0 == local_counter_name.compare("CBColorAndMaskRead")) { @@ -4201,7 +4202,7 @@ bool CubeSample::GpaValidateDataGfx11(unsigned int profile_set, } else if (0 == local_counter_name.compare("TexUnitBusyCycles") || 0 == local_counter_name.compare("MemUnitBusyCycles")) { - return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 500, 5100); + return_value = GpaCounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 500, 8500); } else if (0 == local_counter_name.compare("FetchSize")) { diff --git a/source/examples/opengl/gl_triangle/CMakeLists.txt b/source/examples/opengl/gl_triangle/CMakeLists.txt index 103e3138..7ebd820f 100644 --- a/source/examples/opengl/gl_triangle/CMakeLists.txt +++ b/source/examples/opengl/gl_triangle/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/examples/vulkan/vk_color_cube/CMakeLists.txt b/source/examples/vulkan/vk_color_cube/CMakeLists.txt index 49ac6d58..73bc3454 100644 --- a/source/examples/vulkan/vk_color_cube/CMakeLists.txt +++ b/source/examples/vulkan/vk_color_cube/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../../../") diff --git a/source/examples/vulkan/vk_color_cube/gpa_helper.cc b/source/examples/vulkan/vk_color_cube/gpa_helper.cc index 6c43df06..08141509 100644 --- a/source/examples/vulkan/vk_color_cube/gpa_helper.cc +++ b/source/examples/vulkan/vk_color_cube/gpa_helper.cc @@ -446,16 +446,16 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, } else if (0 == local_counter_name.compare("PSBusy") || 0 == local_counter_name.compare("PSBusyCycles") || 0 == local_counter_name.compare("PSTime")) { - // Sanity Check + // Sanity check return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); } - else if (0 == local_counter_name.compare("PSVALUInstCount") || 0 == local_counter_name.compare("PSVALUBusy") || + else if (0 == local_counter_name.compare("PSVALUInstCount") || 0 == local_counter_name.compare("PSVALUBusyCycles") || 0 == local_counter_name.compare("PSVALUBusy")) { - // Sanity Check + // Sanity check return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); } - else if (0 == local_counter_name.compare("PSSALUInstCount") || 0 == local_counter_name.compare("PSSALUBusy") || + else if (0 == local_counter_name.compare("PSSALUInstCount") || 0 == local_counter_name.compare("PSSALUBusyCycles") || 0 == local_counter_name.compare("PSSALUBusy")) { if (sample_index == 1) @@ -516,13 +516,14 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, } else if (0 == local_counter_name.compare("L0CacheRequestCount") || 0 == local_counter_name.compare("L0CacheMissCount")) { - // Sanity Check + // Sanity check return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); } else if (0 == local_counter_name.compare("L1CacheRequestCount")) { - // Sanity Check - return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); + // Sanity check + return_value = + CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 800.0f, confirm_success); } else if (0 == local_counter_name.compare("L1CacheHit") || 0 == local_counter_name.compare("L1CacheHitCount")) { @@ -544,33 +545,14 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, } else if (0 == local_counter_name.compare("L1CacheMissCount")) { - if (generation == kGpaHwGenerationGfx9) - { - // This sample may or may not return 0. This is obvious since they UINTs, but these are valid results. - return_value = - CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0.0f, 0.0f, confirm_success); - } - else - { - return_value = - CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); - } + return_value = + CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 800.0f, confirm_success); } else if (0 == local_counter_name.compare("L2CacheHit") || 0 == local_counter_name.compare("L2CacheRequestCount") || 0 == local_counter_name.compare("L2CacheHitCount")) { - if (sample_index == 2) - { - // This may equal 0 if the other caches perform well. The conditional below is a truism because a UNIT is always >= 0. - return_value = - CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThanOrEqualTo, 0.0f, 0.0f, confirm_success); - } - else - { - // Sanity Check - return_value = - CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeGreaterThan, 0.0f, 0.0f, confirm_success); - } + return_value = + CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 800.0f, confirm_success); } else if (0 == local_counter_name.compare("L2CacheMiss")) { @@ -582,7 +564,7 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, else if (generation == kGpaHwGenerationGfx10) { return_value = - CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 7.0f, confirm_success); + CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 65.0f, confirm_success); } else if (generation == kGpaHwGenerationGfx103) { @@ -596,7 +578,6 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, } else { - // Sanity check, assumes the L2 cache will not miss more than 50% in our test app and still be a valid result. return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeRangeInclusive, 0.0f, 50.0f, confirm_success); } @@ -633,6 +614,7 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, { return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeEqual, 0.0f, 0.0f, confirm_success); } +#ifdef _WIN32 else if (0 == local_counter_name.compare("VsGsVerticesIn")) { // Sample 0 @@ -645,6 +627,7 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeEqual, vertex_count, 0.0f, confirm_success); } +#endif else if (0 == local_counter_name.compare("GSVerticesOut")) { return_value = CounterValueCompare(profile_set, sample_index, counter_name, counter_value, kCompareTypeEqual, 0.0f, 0.0f, confirm_success); @@ -693,7 +676,7 @@ bool GpaHelper::ValidateData(GpaHwGeneration generation, } else if (0 == local_counter_name.compare("PrimitivesIn")) { - if (generation == kGpaHwGenerationGfx11) + if (generation == kGpaHwGenerationGfx10 || generation >= kGpaHwGenerationGfx11) { // Samples 0 and 1 GpaFloat64 prim_count = 12; diff --git a/source/google_test/CMakeLists.txt b/source/google_test/CMakeLists.txt index 8dd76404..52f74f03 100644 --- a/source/google_test/CMakeLists.txt +++ b/source/google_test/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_cl/CMakeLists.txt b/source/gpu_perf_api_cl/CMakeLists.txt index bcbc02d6..86f82ca3 100644 --- a/source/gpu_perf_api_cl/CMakeLists.txt +++ b/source/gpu_perf_api_cl/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_common/CMakeLists.txt b/source/gpu_perf_api_common/CMakeLists.txt index 648cab54..5592083d 100644 --- a/source/gpu_perf_api_common/CMakeLists.txt +++ b/source/gpu_perf_api_common/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") @@ -95,7 +95,7 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gpa_session.cc ${CMAKE_CURRENT_SOURCE_DIR}/gpa_unique_object.cc ${CMAKE_CURRENT_SOURCE_DIR}/gpu_perf_api.cc - ${CMAKE_CURRENT_SOURCE_DIR}/gpu_perf_api_deprecated.inc + ${CMAKE_CURRENT_SOURCE_DIR}/gpu_perf_api_deprecated.hpp ${CMAKE_CURRENT_SOURCE_DIR}/logging.cc ${CMAKE_CURRENT_SOURCE_DIR}/utility.cc) diff --git a/source/gpu_perf_api_common/gpa_context.cc b/source/gpu_perf_api_common/gpa_context.cc index a604560c..ff629bc1 100644 --- a/source/gpu_perf_api_common/gpa_context.cc +++ b/source/gpu_perf_api_common/gpa_context.cc @@ -290,7 +290,7 @@ DeviceClockMode GpaContext::GetDeviceClockMode() const bool GpaContext::OpenCounters() { - bool success = (kGpaStatusOk == GpaContextCounterMediator::Instance()->GenerateCounters(this, context_flags_, true)); + bool success = (kGpaStatusOk == GpaContextCounterMediator::Instance()->GenerateCounters(this, context_flags_)); return success; } diff --git a/source/gpu_perf_api_common/gpa_context_counter_mediator.cc b/source/gpu_perf_api_common/gpa_context_counter_mediator.cc index 5c4631a9..c185ee74 100644 --- a/source/gpu_perf_api_common/gpa_context_counter_mediator.cc +++ b/source/gpu_perf_api_common/gpa_context_counter_mediator.cc @@ -32,7 +32,7 @@ GpaContextCounterMediator::~GpaContextCounterMediator() context_info_map_.clear(); } -GpaStatus GpaContextCounterMediator::GenerateCounters(const IGpaContext* gpa_context, GpaOpenContextFlags flags, GpaUInt8 generate_asic_specific_counters) +GpaStatus GpaContextCounterMediator::GenerateCounters(const IGpaContext* gpa_context, GpaOpenContextFlags flags) { std::lock_guard lock(context_info_map_mutex_); @@ -58,7 +58,7 @@ GpaStatus GpaContextCounterMediator::GenerateCounters(const IGpaContext* gpa_con if (hw_info->GetVendorId(vendor_id) && hw_info->GetDeviceId(device_id) && hw_info->GetRevisionId(revision_id)) { ret_status = ::GenerateCounters( - gpa_context->GetApiType(), vendor_id, device_id, revision_id, flags, generate_asic_specific_counters, &counter_accessor, &counter_scheduler); + gpa_context->GetApiType(), vendor_id, device_id, revision_id, flags, &counter_accessor, &counter_scheduler); if (kGpaStatusOk == ret_status) { diff --git a/source/gpu_perf_api_common/gpa_context_counter_mediator.h b/source/gpu_perf_api_common/gpa_context_counter_mediator.h index 07fa27d1..a617c917 100644 --- a/source/gpu_perf_api_common/gpa_context_counter_mediator.h +++ b/source/gpu_perf_api_common/gpa_context_counter_mediator.h @@ -35,8 +35,7 @@ class GpaContextCounterMediator /// /// @param [in] gpa_context GPA context. /// @param [in] flags Flags used to initialize the context. Should be a combination of GPA_OpenContext_Bits. - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. - GpaStatus GenerateCounters(const IGpaContext* gpa_context, GpaOpenContextFlags flags, GpaUInt8 generate_asic_specific_counters); + GpaStatus GenerateCounters(const IGpaContext* gpa_context, GpaOpenContextFlags flags); /// @brief Checks whether the counter scheduling is supported or not for the given context. /// diff --git a/source/gpu_perf_api_common/gpa_version.h b/source/gpu_perf_api_common/gpa_version.h index 1cffa856..22983093 100644 --- a/source/gpu_perf_api_common/gpa_version.h +++ b/source/gpu_perf_api_common/gpa_version.h @@ -12,7 +12,7 @@ // Make sure to increment GPA_FUNCTION_TABLE_MAJOR_VERSION_NUMBER anytime GPA_MAJOR_VERSION is incremented #define GPA_MAJOR_VERSION 3 ///< Macro for GPA major version. -#define GPA_MINOR_VERSION 14 ///< Macro for GPA minor version. +#define GPA_MINOR_VERSION 15 ///< Macro for GPA minor version. #define GPA_UPDATE_VERSION 0 ///< Macro for GPA update version. /// Macro for GPA build number diff --git a/source/gpu_perf_api_common/gpu_perf_api.cc b/source/gpu_perf_api_common/gpu_perf_api.cc index 9dd88f5f..665b5aa7 100644 --- a/source/gpu_perf_api_common/gpu_perf_api.cc +++ b/source/gpu_perf_api_common/gpu_perf_api.cc @@ -1698,4 +1698,4 @@ GPA_LIB_DECL const char* GpaGetStatusAsStr(GpaStatus gpa_status_as_str) } } -#include "gpu_perf_api_deprecated.inc" +#include "gpu_perf_api_deprecated.hpp" diff --git a/source/gpu_perf_api_common/gpu_perf_api_deprecated.inc b/source/gpu_perf_api_common/gpu_perf_api_deprecated.hpp similarity index 100% rename from source/gpu_perf_api_common/gpu_perf_api_deprecated.inc rename to source/gpu_perf_api_common/gpu_perf_api_deprecated.hpp diff --git a/source/gpu_perf_api_common/logging.h b/source/gpu_perf_api_common/logging.h index 90c496bf..3ecd1ff9 100644 --- a/source/gpu_perf_api_common/logging.h +++ b/source/gpu_perf_api_common/logging.h @@ -101,7 +101,7 @@ class GpaLogger : public TSingleton EnterCriticalSection(&lock_handle); // Format string. - char buffer[1024 * 50]; + char buffer[1024 * 5]; buffer[0] = '\0'; #ifdef WIN32 vsnprintf_s(buffer, sizeof(buffer), msg_fmt, args); diff --git a/source/gpu_perf_api_counter_generator/CMakeLists.txt b/source/gpu_perf_api_counter_generator/CMakeLists.txt index eb66e21b..5452dbb6 100644 --- a/source/gpu_perf_api_counter_generator/CMakeLists.txt +++ b/source/gpu_perf_api_counter_generator/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counter_generator/counter_generator_cl.cmake b/source/gpu_perf_api_counter_generator/counter_generator_cl.cmake index 1c2ae2e3..68e730fd 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_cl.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_cl.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/source/gpu_perf_api_counter_generator/counter_generator_common.cmake b/source/gpu_perf_api_counter_generator/counter_generator_common.cmake index 02c608c8..f129536c 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_common.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_common.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") @@ -73,7 +73,7 @@ set(HARDWARE_COUNTER_SRC ${HARDWARE_COUNTER_SRC} ${HW_COUNTER_SRC}) set(DERIVED_COUNTER_HEADERS gpa_derived_counter.h - gpa_derived_counter_evaluator.inc) + gpa_derived_counter_evaluator.hpp) set(DERIVED_COUNTER_SRC gpa_derived_counter.cc) diff --git a/source/gpu_perf_api_counter_generator/counter_generator_dx11.cmake b/source/gpu_perf_api_counter_generator/counter_generator_dx11.cmake index 8f200f4c..70f9ce0b 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_dx11.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_dx11.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counter_generator/counter_generator_dx12.cmake b/source/gpu_perf_api_counter_generator/counter_generator_dx12.cmake index 4bc6fd57..584dd793 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_dx12.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_dx12.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counter_generator/counter_generator_gl.cmake b/source/gpu_perf_api_counter_generator/counter_generator_gl.cmake index 501484ea..57935642 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_gl.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_gl.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counter_generator/counter_generator_vk.cmake b/source/gpu_perf_api_counter_generator/counter_generator_vk.cmake index 867642d1..9101e902 100644 --- a/source/gpu_perf_api_counter_generator/counter_generator_vk.cmake +++ b/source/gpu_perf_api_counter_generator/counter_generator_vk.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counter_generator/gpa_counter.h b/source/gpu_perf_api_counter_generator/gpa_counter.h index 0f98fec4..100ad7b0 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter.h @@ -23,7 +23,6 @@ struct GpaCounterGroupExposedCounterDesc { GpaUInt32 group_index; ///< Index of the exposed counter group. GpaUInt32 hardware_block_start_index; ///< Start index of the counter in this counter group. - std::vector white_list_counters; ///< List of the exposed counters in the group. }; /// @brief Contains the GPA padded counter information. diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator.cc index 49487e29..df1f6f5e 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator.cc @@ -136,7 +136,6 @@ GpaStatus GenerateCounters(GpaApiType desired_api, GpaUInt32 device_id, GpaUInt32 revision_id, GpaOpenContextFlags flags, - GpaUInt8 generate_asic_specific_counters, IGpaCounterAccessor** counter_accessor_out, IGpaCounterScheduler** counter_scheduler_out) { @@ -195,7 +194,7 @@ GpaStatus GenerateCounters(GpaApiType desired_api, bool allow_hardware = (flags & kGpaOpenContextEnableHardwareCountersBit) == kGpaOpenContextEnableHardwareCountersBit; tmp_accessor->SetAllowedCounters(allow_public, allow_hardware); - status = tmp_accessor->GenerateCounters(desired_generation, card_info.m_asicType, generate_asic_specific_counters); + status = tmp_accessor->GenerateCounters(desired_generation, card_info.m_asicType); if (status == kGpaStatusOk) { diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator.h index 034a0e81..0d32c2a6 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2012-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2012-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief GPUPerfAPI Counter Generator function. @@ -22,7 +22,6 @@ /// @param [in] device_id The device id to generate counters for. /// @param [in] revision_id The revision id to generate counters for. /// @param [in] flags Flags used to initialize the context. Should be a combination of GpaOpenContextBits. -/// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available.. /// @param [in,out] counter_accessor_out Address of a counter accessor pointer which will be set to the necessary counter accessor. /// @param [in,out] counter_scheduler_out Address of a counter scheduler pointer which will be set to the necessary counter scheduler. /// @@ -36,7 +35,6 @@ GpaStatus GenerateCounters(GpaApiType desired_api, GpaUInt32 device_id, GpaUInt32 revision_id, GpaOpenContextFlags flags, - GpaUInt8 generate_asic_specific_counters, IGpaCounterAccessor** counter_accessor_out, IGpaCounterScheduler** counter_scheduler_out); diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.cc index 8b99f770..8c7020a8 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.cc @@ -22,7 +22,7 @@ void GpaCounterGeneratorBase::SetAllowedCounters(bool allow_public_counters, boo do_allow_hardware_exposed_counters_ = allow_hardware_counters; } -GpaStatus GpaCounterGeneratorBase::GenerateCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, GpaUInt8 generate_asic_specific_counters) +GpaStatus GpaCounterGeneratorBase::GenerateCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type) { GpaStatus status = kGpaStatusErrorNotEnabled; @@ -31,7 +31,7 @@ GpaStatus GpaCounterGeneratorBase::GenerateCounters(GDT_HW_GENERATION desired_ge if (do_allow_public_counters_) { - status = GeneratePublicCounters(desired_generation, asic_type, generate_asic_specific_counters, &public_counters_); + status = GeneratePublicCounters(desired_generation, asic_type, &public_counters_); if (status != kGpaStatusOk) { @@ -43,7 +43,7 @@ GpaStatus GpaCounterGeneratorBase::GenerateCounters(GDT_HW_GENERATION desired_ge // Hw counters are required if generating public counters. if (do_allow_public_counters_ || do_allow_hardware_counters_ || do_allow_hardware_exposed_counters_) { - status = GenerateHardwareCounters(desired_generation, asic_type, generate_asic_specific_counters, &hardware_counters_); + status = GenerateHardwareCounters(desired_generation, asic_type, &hardware_counters_); if (status != kGpaStatusOk) { @@ -54,7 +54,7 @@ GpaStatus GpaCounterGeneratorBase::GenerateCounters(GDT_HW_GENERATION desired_ge if (!do_allow_hardware_counters_ && do_allow_hardware_exposed_counters_) { - status = GenerateHardwareExposedCounters(desired_generation, asic_type, generate_asic_specific_counters, &hardware_counters_); + status = GenerateHardwareExposedCounters(desired_generation, asic_type, &hardware_counters_); if (status != kGpaStatusOk) { @@ -118,12 +118,10 @@ GpaUInt32 GpaCounterGeneratorBase::GetNumAmdCounters() const GpaStatus GpaCounterGeneratorBase::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(hardware_counters); return kGpaStatusOk; } @@ -138,21 +136,25 @@ bool GpaCounterGeneratorBase::MapHardwareExposedCounter(GpaHardwareCounters* har } hardware_counters->hardware_exposed_counters_list_.clear(); - for (unsigned int g = 0; g < hardware_counters->hardware_exposed_counter_group_count_; g++) + size_t num_hardware_exposed_counter_groups = hardware_counters->hardware_exposed_counters_.size(); + for (size_t g = 0; g < num_hardware_exposed_counter_groups; ++g) { const GpaUInt32 block_counter_start_index = hardware_counters->hardware_exposed_counter_groups_[g].hardware_block_start_index; + const GpaUInt32 num_exposed_counters_in_group = static_cast(hardware_counters->hardware_exposed_counters_[g]->size()); - unsigned int count_iter = 0; - for (auto iter = hardware_counters->hardware_exposed_counter_groups_[g].white_list_counters.cbegin(); - iter != hardware_counters->hardware_exposed_counter_groups_[g].white_list_counters.cend(); - ++iter) + for (unsigned int count_iter = 0; count_iter < num_exposed_counters_in_group; ++count_iter) { - GpaHardwareCounterDesc* whitelist_counter = &hardware_counters->hardware_exposed_counters_.at(g)->at(count_iter); - hardware_counters->hardware_exposed_counters_list_.push_back(*whitelist_counter); - unsigned int global_counter_index = block_counter_start_index + *iter; + // Get the counter to expose. + GpaHardwareCounterDesc* exposed_counter = &hardware_counters->hardware_exposed_counters_.at(g)->at(count_iter); + + // Add the counter to a long list of all the exposed counters from all the groups. + hardware_counters->hardware_exposed_counters_list_.push_back(*exposed_counter); + + // Calculate the global counter index, add it to a long list of all the global counter indices, + // and add it to a map directly to the corresponding exposed counter. + GpaUInt32 global_counter_index = block_counter_start_index + static_cast(exposed_counter->counter_index_in_group); hardware_counters->hardware_exposed_counter_internal_indices_list_.push_back(global_counter_index); - hardware_counters->hardware_counters_[global_counter_index].hardware_counters = whitelist_counter; - count_iter++; + hardware_counters->hardware_counters_[global_counter_index].hardware_counters = exposed_counter; } } diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.h index 7b8e444a..f5339a63 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_base.h @@ -95,10 +95,9 @@ class GpaCounterGeneratorBase : public IGpaCounterAccessor /// /// @param [in] desired_generation The generation whose counters are needed. /// @param [in] asic_type The ASIC type whose counters are needed. - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. /// /// @return kGpaStatusOk on success. - GpaStatus GenerateCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, GpaUInt8 generate_asic_specific_counters); + GpaStatus GenerateCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type); /// @copydoc IGpaCounterAccessor::ComputeSwCounterValue(). void ComputeSwCounterValue(GpaUInt32 software_counter_index, GpaUInt64 value, void* result, const GpaHwInfo* hardware_info) const override; @@ -112,39 +111,33 @@ class GpaCounterGeneratorBase : public IGpaCounterAccessor /// /// @param [in] desired_generation The generation whose counters are needed. /// @param [in] asic_type The ASIC whose counters are needed. - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. /// @param [out] public_counters The generated counters. /// /// @return kGpaStatusOk on success. virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) = 0; /// @brief Generate the hardware counters for the specified hardware generation. /// /// @param [in] desired_generation The generation whose counters are needed. /// @param [in] asic_type The ASIC whose counters are needed. - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. /// @param [out] hardware_counters The generated counters. /// /// @return kGpaStatusOk on success. virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) = 0; /// @brief Generate the hardware exposed counters for the specified hardware generation /// /// @param [in] desired_generation The generation whose counters are needed /// @param [in] asic_type The ASIC whose counters are needed - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. /// @param [out] hardware_counters The generated counters /// /// @return kGpaStatusOk on success virtual GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters); /// @brief Maps the hardware counter and hardware exposed counter. diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.cc index 98675122..4a7dc949 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.cc @@ -43,7 +43,6 @@ GpaCounterGeneratorCl::GpaCounterGeneratorCl() GpaStatus GpaCounterGeneratorCl::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { GpaStatus status = kGpaStatusErrorHardwareNotSupported; @@ -63,56 +62,31 @@ GpaStatus GpaCounterGeneratorCl::GeneratePublicCounters(GDT_HW_GENERATION desi if (desired_generation == GDT_HW_GENERATION_VOLCANICISLAND) { AutoDefinePublicDerivedCountersClGfx8(*public_counters); - - if (generate_asic_specific_counters) - { - cl_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + cl_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { AutoDefinePublicDerivedCountersClGfx9(*public_counters); - - if (generate_asic_specific_counters) - { - cl_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + cl_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { AutoDefinePublicDerivedCountersClGfx10(*public_counters); - - if (generate_asic_specific_counters) - { - cl_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + cl_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { AutoDefinePublicDerivedCountersClGfx103(*public_counters); - - if (generate_asic_specific_counters) - { - cl_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + cl_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { AutoDefinePublicDerivedCountersClGfx11(*public_counters); - - if (generate_asic_specific_counters) - { - cl_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + cl_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else @@ -159,11 +133,9 @@ int GpaCounterGeneratorCl::GetDriverGroupId(GDT_HW_GENERATION desired_generation GpaStatus GpaCounterGeneratorCl::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -295,11 +267,9 @@ bool GpaCounterGeneratorCl::GenerateInternalCounters(GpaHardwareCounters* hardwa GpaStatus GpaCounterGeneratorCl::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (hardware_counters->hardware_exposed_counters_generated_) { @@ -310,31 +280,26 @@ GpaStatus GpaCounterGeneratorCl::GenerateHardwareExposedCounters(GDT_HW_GENERATI { hardware_counters->hardware_exposed_counters_ = counter_cl_gfx8::kClCounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_cl_gfx8::kHwClExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_cl_gfx8::kHwClExposedCountersGroupCountGfx8; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { hardware_counters->hardware_exposed_counters_ = counter_cl_gfx9::kClCounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_cl_gfx9::kHwClExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_cl_gfx9::kHwClExposedCountersGroupCountGfx9; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { hardware_counters->hardware_exposed_counters_ = counter_cl_gfx10::kClCounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_cl_gfx10::kHwClExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_cl_gfx10::kHwClExposedCountersGroupCountGfx10; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { hardware_counters->hardware_exposed_counters_ = counter_cl_gfx103::kClCounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_cl_gfx103::kHwClExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_cl_gfx103::kHwClExposedCountersGroupCountGfx103; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { hardware_counters->hardware_exposed_counters_ = counter_cl_gfx11::kClCounterGroupArrayGfx11; hardware_counters->hardware_exposed_counter_groups_ = counter_cl_gfx11::kHwClExposedCountersByGroupGfx11; - hardware_counters->hardware_exposed_counter_group_count_ = counter_cl_gfx11::kHwClExposedCountersGroupCountGfx11; } else { diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.h index 59ad2b2b..64191579 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_cl.h @@ -21,19 +21,16 @@ class GpaCounterGeneratorCl : public GpaCounterGeneratorBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareExposedCounters() GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.cc index eacf3a63..0ac8a92d 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.cc @@ -155,7 +155,6 @@ bool GpaCounterGeneratorDx11::GenerateInternalCounters(GpaHardwareCounters* hard GpaStatus GpaCounterGeneratorDx11::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { GpaStatus status = kGpaStatusErrorHardwareNotSupported; @@ -175,56 +174,31 @@ GpaStatus GpaCounterGeneratorDx11::GeneratePublicCounters(GDT_HW_GENERATION de if (desired_generation == GDT_HW_GENERATION_VOLCANICISLAND) { AutoDefinePublicDerivedCountersDx11Gfx8(*public_counters); - - if (generate_asic_specific_counters) - { - dx11_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx11_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { AutoDefinePublicDerivedCountersDx11Gfx9(*public_counters); - - if (generate_asic_specific_counters) - { - dx11_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx11_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { AutoDefinePublicDerivedCountersDx11Gfx10(*public_counters); - - if (generate_asic_specific_counters) - { - dx11_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx11_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { AutoDefinePublicDerivedCountersDx11Gfx103(*public_counters); - - if (generate_asic_specific_counters) - { - dx11_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx11_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { AutoDefinePublicDerivedCountersDx11Gfx11(*public_counters); - - if (generate_asic_specific_counters) - { - dx11_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx11_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } else @@ -249,11 +223,9 @@ GpaStatus GpaCounterGeneratorDx11::GeneratePublicCounters(GDT_HW_GENERATION de GpaStatus GpaCounterGeneratorDx11::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -378,11 +350,9 @@ GpaStatus GpaCounterGeneratorDx11::GenerateHardwareCounters(GDT_HW_GENERATION GpaStatus GpaCounterGeneratorDx11::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (hardware_counters->hardware_exposed_counters_generated_) { @@ -393,31 +363,26 @@ GpaStatus GpaCounterGeneratorDx11::GenerateHardwareExposedCounters(GDT_HW_GENERA { hardware_counters->hardware_exposed_counters_ = counter_dx11_gfx8::kDx11CounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_dx11_gfx8::kHwDx11ExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx11_gfx8::kHwDx11ExposedCountersGroupCountGfx8; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { hardware_counters->hardware_exposed_counters_ = counter_dx11_gfx9::kDx11CounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_dx11_gfx9::kHwDx11ExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx11_gfx9::kHwDx11ExposedCountersGroupCountGfx9; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { hardware_counters->hardware_exposed_counters_ = counter_dx11_gfx10::kDx11CounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_dx11_gfx10::kHwDx11ExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx11_gfx10::kHwDx11ExposedCountersGroupCountGfx10; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { hardware_counters->hardware_exposed_counters_ = counter_dx11_gfx103::kDx11CounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_dx11_gfx103::kHwDx11ExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx11_gfx103::kHwDx11ExposedCountersGroupCountGfx103; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { hardware_counters->hardware_exposed_counters_ = counter_dx11_gfx11::kDx11CounterGroupArrayGfx11; hardware_counters->hardware_exposed_counter_groups_ = counter_dx11_gfx11::kHwDx11ExposedCountersByGroupGfx11; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx11_gfx11::kHwDx11ExposedCountersGroupCountGfx11; } else { diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.h index 3827c9d0..36bd8c50 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2016-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2016-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief Class for DX11 counter generation for AMD HW. @@ -21,19 +21,16 @@ class GpaCounterGeneratorDx11 : public GpaCounterGeneratorDx11Base /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareExposedCounters() GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.cc index 8d32dd65..632d208e 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.cc @@ -25,26 +25,22 @@ GpaCounterGeneratorDx11Base::GpaCounterGeneratorDx11Base() GpaStatus GpaCounterGeneratorDx11Base::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { // Do nothing in base class. UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(public_counters); return kGpaStatusOk; } GpaStatus GpaCounterGeneratorDx11Base::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { // Do nothing in base class. UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(hardware_counters); return kGpaStatusOk; } diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.h index 52aae425..09a5d97d 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx11_base.h @@ -20,13 +20,11 @@ class GpaCounterGeneratorDx11Base : public GpaCounterGeneratorBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @brief Helper function to indicates whether the specified HW generation represents an AMD GPU. diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.cc index 3cf27129..8c0ae00e 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.cc @@ -82,7 +82,6 @@ GpaCounterGeneratorDx12::GpaCounterGeneratorDx12() GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { GpaStatus status = kGpaStatusErrorHardwareNotSupported; @@ -104,12 +103,7 @@ GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION de case GDT_HW_GENERATION_VOLCANICISLAND: { AutoDefinePublicDerivedCountersDx12Gfx8(*public_counters); - - if (generate_asic_specific_counters) - { - dx12_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx12_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -117,12 +111,7 @@ GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION de case GDT_HW_GENERATION_GFX9: { AutoDefinePublicDerivedCountersDx12Gfx9(*public_counters); - - if (generate_asic_specific_counters) - { - dx12_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx12_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -130,12 +119,7 @@ GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION de case GDT_HW_GENERATION_GFX10: { AutoDefinePublicDerivedCountersDx12Gfx10(*public_counters); - - if (generate_asic_specific_counters) - { - dx12_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx12_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -143,12 +127,7 @@ GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION de case GDT_HW_GENERATION_GFX103: { AutoDefinePublicDerivedCountersDx12Gfx103(*public_counters); - - if (generate_asic_specific_counters) - { - dx12_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx12_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -156,12 +135,7 @@ GpaStatus GpaCounterGeneratorDx12::GeneratePublicCounters(GDT_HW_GENERATION de case GDT_HW_GENERATION_GFX11: { AutoDefinePublicDerivedCountersDx12Gfx11(*public_counters); - - if (generate_asic_specific_counters) - { - dx12_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + dx12_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -228,11 +202,9 @@ bool GpaCounterGeneratorDx12::GenerateInternalCounters(GpaHardwareCounters* hard GpaStatus GpaCounterGeneratorDx12::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); GpaStatus status = kGpaStatusOk; @@ -360,11 +332,9 @@ GpaStatus GpaCounterGeneratorDx12::GenerateHardwareCounters(GDT_HW_GENERATION GpaStatus GpaCounterGeneratorDx12::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -380,31 +350,26 @@ GpaStatus GpaCounterGeneratorDx12::GenerateHardwareExposedCounters(GDT_HW_GENERA { hardware_counters->hardware_exposed_counters_ = counter_dx12_gfx8::kDx12CounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_dx12_gfx8::kHwDx12ExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx12_gfx8::kHwDx12ExposedCountersGroupCountGfx8; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { hardware_counters->hardware_exposed_counters_ = counter_dx12_gfx9::kDx12CounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_dx12_gfx9::kHwDx12ExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx12_gfx9::kHwDx12ExposedCountersGroupCountGfx9; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { hardware_counters->hardware_exposed_counters_ = counter_dx12_gfx10::kDx12CounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_dx12_gfx10::kHwDx12ExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx12_gfx10::kHwDx12ExposedCountersGroupCountGfx10; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { hardware_counters->hardware_exposed_counters_ = counter_dx12_gfx103::kDx12CounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_dx12_gfx103::kHwDx12ExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx12_gfx103::kHwDx12ExposedCountersGroupCountGfx103; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { hardware_counters->hardware_exposed_counters_ = counter_dx12_gfx11::kDx12CounterGroupArrayGfx11; hardware_counters->hardware_exposed_counter_groups_ = counter_dx12_gfx11::kHwDx12ExposedCountersByGroupGfx11; - hardware_counters->hardware_exposed_counter_group_count_ = counter_dx12_gfx11::kHwDx12ExposedCountersGroupCountGfx11; } else { diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.h index 77e586f3..244ffb26 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2015-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2015-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief Class for DX12 counter generation. @@ -40,19 +40,16 @@ class GpaCounterGeneratorDx12 : public GpaCounterGeneratorDx12Base /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareExposedCounters() GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.cc index 0f36c6bd..c80032c9 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.cc @@ -13,24 +13,20 @@ GpaStatus GpaCounterGeneratorDx12Base::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(public_counters); return kGpaStatusOk; } GpaStatus GpaCounterGeneratorDx12Base::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(hardware_counters); return kGpaStatusOk; } diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.h index 52b22889..abb064af 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_dx12_base.h @@ -24,13 +24,11 @@ class GpaCounterGeneratorDx12Base : public GpaCounterGeneratorBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.cc index 08dec5cd..91b5ca58 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.cc @@ -341,7 +341,6 @@ void GpaCounterGeneratorGl::Cleanup() GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { GpaStatus status = kGpaStatusErrorHardwareNotSupported; @@ -365,12 +364,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_VOLCANICISLAND: { AutoDefinePublicDerivedCountersGlGfx8(*public_counters); - - if (generate_asic_specific_counters) - { - gl_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + gl_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -378,12 +372,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX9: { AutoDefinePublicDerivedCountersGlGfx9(*public_counters); - - if (generate_asic_specific_counters) - { - gl_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + gl_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -391,12 +380,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX10: { AutoDefinePublicDerivedCountersGlGfx10(*public_counters); - - if (generate_asic_specific_counters) - { - gl_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + gl_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -404,12 +388,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX103: { AutoDefinePublicDerivedCountersGlGfx103(*public_counters); - - if (generate_asic_specific_counters) - { - gl_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + gl_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -426,12 +405,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_VOLCANICISLAND: { AutoDefinePublicDerivedCountersOglpGfx8(*public_counters); - - if (generate_asic_specific_counters) - { - oglp_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + oglp_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -439,12 +413,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX9: { AutoDefinePublicDerivedCountersOglpGfx9(*public_counters); - - if (generate_asic_specific_counters) - { - oglp_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + oglp_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -452,12 +421,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX10: { AutoDefinePublicDerivedCountersOglpGfx10(*public_counters); - - if (generate_asic_specific_counters) - { - oglp_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + oglp_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -465,12 +429,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX103: { AutoDefinePublicDerivedCountersOglpGfx103(*public_counters); - - if (generate_asic_specific_counters) - { - oglp_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + oglp_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -478,12 +437,7 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX11: { AutoDefinePublicDerivedCountersOglpGfx11(*public_counters); - - if (generate_asic_specific_counters) - { - oglp_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + oglp_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -509,11 +463,9 @@ GpaStatus GpaCounterGeneratorGl::GeneratePublicCounters(GDT_HW_GENERATION desi GpaStatus GpaCounterGeneratorGl::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); GpaStatus status = kGpaStatusOk; @@ -746,11 +698,9 @@ GpaStatus GpaCounterGeneratorGl::GenerateHardwareCounters(GDT_HW_GENERATION d GpaStatus GpaCounterGeneratorGl::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -769,25 +719,21 @@ GpaStatus GpaCounterGeneratorGl::GenerateHardwareExposedCounters(GDT_HW_GENERATI case GDT_HW_GENERATION_VOLCANICISLAND: hardware_counters->hardware_exposed_counters_ = counter_gl_gfx8::kGlCounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_gl_gfx8::kHwGlExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_gl_gfx8::kHwGlExposedCountersGroupCountGfx8; break; case GDT_HW_GENERATION_GFX9: hardware_counters->hardware_exposed_counters_ = counter_gl_gfx9::kGlCounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_gl_gfx9::kHwGlExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_gl_gfx9::kHwGlExposedCountersGroupCountGfx9; break; case GDT_HW_GENERATION_GFX10: hardware_counters->hardware_exposed_counters_ = counter_gl_gfx10::kGlCounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_gl_gfx10::kHwGlExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_gl_gfx10::kHwGlExposedCountersGroupCountGfx10; break; case GDT_HW_GENERATION_GFX103: hardware_counters->hardware_exposed_counters_ = counter_gl_gfx103::kGlCounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_gl_gfx103::kHwGlExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_gl_gfx103::kHwGlExposedCountersGroupCountGfx103; break; default: @@ -802,31 +748,26 @@ GpaStatus GpaCounterGeneratorGl::GenerateHardwareExposedCounters(GDT_HW_GENERATI case GDT_HW_GENERATION_VOLCANICISLAND: hardware_counters->hardware_exposed_counters_ = counter_oglp_gfx8::kOglpCounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_oglp_gfx8::kHwOglpExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_oglp_gfx8::kHwOglpExposedCountersGroupCountGfx8; break; case GDT_HW_GENERATION_GFX9: hardware_counters->hardware_exposed_counters_ = counter_oglp_gfx9::kOglpCounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_oglp_gfx9::kHwOglpExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_oglp_gfx9::kHwOglpExposedCountersGroupCountGfx9; break; case GDT_HW_GENERATION_GFX10: hardware_counters->hardware_exposed_counters_ = counter_oglp_gfx10::kOglpCounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_oglp_gfx10::kHwOglpExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_oglp_gfx10::kHwOglpExposedCountersGroupCountGfx10; break; case GDT_HW_GENERATION_GFX103: hardware_counters->hardware_exposed_counters_ = counter_oglp_gfx103::kOglpCounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_oglp_gfx103::kHwOglpExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_oglp_gfx103::kHwOglpExposedCountersGroupCountGfx103; break; case GDT_HW_GENERATION_GFX11: hardware_counters->hardware_exposed_counters_ = counter_oglp_gfx11::kOglpCounterGroupArrayGfx11; hardware_counters->hardware_exposed_counter_groups_ = counter_oglp_gfx11::kHwOglpExposedCountersByGroupGfx11; - hardware_counters->hardware_exposed_counter_group_count_ = counter_oglp_gfx11::kHwOglpExposedCountersGroupCountGfx11; break; default: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.h index 40727a0f..46884e51 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_gl.h @@ -24,19 +24,16 @@ class GpaCounterGeneratorGl : public GpaCounterGeneratorBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareExposedCounters() GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.cc index df73c51b..dc6ec40f 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.cc @@ -82,7 +82,6 @@ GpaCounterGeneratorVk::GpaCounterGeneratorVk() GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { GpaStatus status = kGpaStatusErrorHardwareNotSupported; @@ -104,12 +103,7 @@ GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_VOLCANICISLAND: { AutoDefinePublicDerivedCountersVkGfx8(*public_counters); - - if (generate_asic_specific_counters) - { - vk_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + vk_gfx8_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -117,12 +111,7 @@ GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX9: { AutoDefinePublicDerivedCountersVkGfx9(*public_counters); - - if (generate_asic_specific_counters) - { - vk_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + vk_gfx9_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -130,12 +119,7 @@ GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX10: { AutoDefinePublicDerivedCountersVkGfx10(*public_counters); - - if (generate_asic_specific_counters) - { - vk_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + vk_gfx10_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -143,12 +127,7 @@ GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX103: { AutoDefinePublicDerivedCountersVkGfx103(*public_counters); - - if (generate_asic_specific_counters) - { - vk_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + vk_gfx103_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -156,12 +135,7 @@ GpaStatus GpaCounterGeneratorVk::GeneratePublicCounters(GDT_HW_GENERATION desi case GDT_HW_GENERATION_GFX11: { AutoDefinePublicDerivedCountersVkGfx11(*public_counters); - - if (generate_asic_specific_counters) - { - vk_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); - } - + vk_gfx11_asics::UpdatePublicAsicSpecificCounters(desired_generation, asic_type, *public_counters); status = kGpaStatusOk; } break; @@ -228,11 +202,9 @@ bool GpaCounterGeneratorVk::GenerateInternalCounters(GpaHardwareCounters* hardwa GpaStatus GpaCounterGeneratorVk::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -358,11 +330,9 @@ GpaStatus GpaCounterGeneratorVk::GenerateHardwareCounters(GDT_HW_GENERATION d GpaStatus GpaCounterGeneratorVk::GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); if (nullptr == hardware_counters) { @@ -378,31 +348,26 @@ GpaStatus GpaCounterGeneratorVk::GenerateHardwareExposedCounters(GDT_HW_GENERATI { hardware_counters->hardware_exposed_counters_ = counter_vk_gfx8::kVkCounterGroupArrayGfx8; hardware_counters->hardware_exposed_counter_groups_ = counter_vk_gfx8::kHwVkExposedCountersByGroupGfx8; - hardware_counters->hardware_exposed_counter_group_count_ = counter_vk_gfx8::kHwVkExposedCountersGroupCountGfx8; } else if (desired_generation == GDT_HW_GENERATION_GFX9) { hardware_counters->hardware_exposed_counters_ = counter_vk_gfx9::kVkCounterGroupArrayGfx9; hardware_counters->hardware_exposed_counter_groups_ = counter_vk_gfx9::kHwVkExposedCountersByGroupGfx9; - hardware_counters->hardware_exposed_counter_group_count_ = counter_vk_gfx9::kHwVkExposedCountersGroupCountGfx9; } else if (desired_generation == GDT_HW_GENERATION_GFX10) { hardware_counters->hardware_exposed_counters_ = counter_vk_gfx10::kVkCounterGroupArrayGfx10; hardware_counters->hardware_exposed_counter_groups_ = counter_vk_gfx10::kHwVkExposedCountersByGroupGfx10; - hardware_counters->hardware_exposed_counter_group_count_ = counter_vk_gfx10::kHwVkExposedCountersGroupCountGfx10; } else if (desired_generation == GDT_HW_GENERATION_GFX103) { hardware_counters->hardware_exposed_counters_ = counter_vk_gfx103::kVkCounterGroupArrayGfx103; hardware_counters->hardware_exposed_counter_groups_ = counter_vk_gfx103::kHwVkExposedCountersByGroupGfx103; - hardware_counters->hardware_exposed_counter_group_count_ = counter_vk_gfx103::kHwVkExposedCountersGroupCountGfx103; } else if (desired_generation == GDT_HW_GENERATION_GFX11) { hardware_counters->hardware_exposed_counters_ = counter_vk_gfx11::kVkCounterGroupArrayGfx11; hardware_counters->hardware_exposed_counter_groups_ = counter_vk_gfx11::kHwVkExposedCountersByGroupGfx11; - hardware_counters->hardware_exposed_counter_group_count_ = counter_vk_gfx11::kHwVkExposedCountersGroupCountGfx11; } else { diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.h index 4300c9ef..25a8aea4 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief Class for VK counter generation. @@ -40,19 +40,16 @@ class GpaCounterGeneratorVk : public GpaCounterGeneratorVkBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareExposedCounters() GpaStatus GenerateHardwareExposedCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.cc b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.cc index fad5d109..aefdd92c 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.cc +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.cc @@ -12,24 +12,20 @@ GpaStatus GpaCounterGeneratorVkBase::GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) { UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(public_counters); return kGpaStatusOk; } GpaStatus GpaCounterGeneratorVkBase::GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) { UNREFERENCED_PARAMETER(desired_generation); UNREFERENCED_PARAMETER(asic_type); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(hardware_counters); return kGpaStatusOk; } diff --git a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.h b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.h index d1640255..703cd63c 100644 --- a/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.h +++ b/source/gpu_perf_api_counter_generator/gpa_counter_generator_vk_base.h @@ -24,13 +24,11 @@ class GpaCounterGeneratorVkBase : public GpaCounterGeneratorBase /// @copydoc GpaCounterGeneratorBase::GeneratePublicCounters() virtual GpaStatus GeneratePublicCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaDerivedCounters* public_counters) override; /// @copydoc GpaCounterGeneratorBase::GenerateHardwareCounters() virtual GpaStatus GenerateHardwareCounters(GDT_HW_GENERATION desired_generation, GDT_HW_ASIC_TYPE asic_type, - GpaUInt8 generate_asic_specific_counters, GpaHardwareCounters* hardware_counters) override; private: diff --git a/source/gpu_perf_api_counter_generator/gpa_derived_counter.cc b/source/gpu_perf_api_counter_generator/gpa_derived_counter.cc index cba3f6b9..cfec0aea 100644 --- a/source/gpu_perf_api_counter_generator/gpa_derived_counter.cc +++ b/source/gpu_perf_api_counter_generator/gpa_derived_counter.cc @@ -22,6 +22,7 @@ #include "gpu_perf_api_common/utility.h" #include "gpu_perf_api_counter_generator/gpa_derived_counter.h" +#include "gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.hpp" #include "gpu_perf_api_counter_generator/gpa_hardware_counters.h" GpaDerivedCounterInfoClass::GpaDerivedCounterInfoClass() @@ -250,8 +251,6 @@ GpaUInt32 GpaDerivedCounters::GetNumCounters() const return static_cast(derived_counter_list_.size()); } -#include "gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.inc" - GpaStatus GpaDerivedCounters::ComputeCounterValue(GpaUInt32 counter_index, const vector& results, vector& internal_counter_types, diff --git a/source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.inc b/source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.hpp similarity index 87% rename from source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.inc rename to source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.hpp index 0948e50a..9e2ee54e 100644 --- a/source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.inc +++ b/source/gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.hpp @@ -5,6 +5,11 @@ /// @brief Functions for evaluating derived counter formula. //============================================================================== +#include + +#include "gpu_performance_api/gpu_perf_api_types.h" +#include "gpu_perf_api_common/gpa_hw_info.h" + /// @brief Performs a sum of the specified number of stack values. /// /// T is derived counter type. @@ -262,11 +267,11 @@ void ScalarMulN(std::vector& stack, int32_t vector_width) /// /// @return kGpaStatusOk on success, otherwise an error code. template -static GpaStatus EvaluateExpression(const char* expression, - void* result, - const vector& results, - GpaDataType result_type, - const GpaHwInfo* hw_info) +static GpaStatus EvaluateExpression(const char* expression, + void* result, + const std::vector& results, + GpaDataType result_type, + const GpaHwInfo* hw_info) { GpaStatus status = kGpaStatusOk; @@ -341,7 +346,7 @@ static GpaStatus EvaluateExpression(const char* expression, else if (*pch == '(') { // constant - T constant = static_cast(0); + T constant = static_cast(0); int scan_result = 0; if (result_type == kGpaDataTypeFloat64) @@ -398,6 +403,8 @@ static GpaStatus EvaluateExpression(const char* expression, { stack.push_back(static_cast(hw_info->GetNumberCus())); } +// START_REMOVE_DURING_SANITIZATION +// END_REMOVE_DURING_SANITIZATION else if (_strcmpi(pch, "TS_FREQ") == 0) { GpaUInt64 freq = 1u; @@ -411,8 +418,8 @@ static GpaStatus EvaluateExpression(const char* expression, if (pch[3] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[3], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[3], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); @@ -435,8 +442,8 @@ static GpaStatus EvaluateExpression(const char* expression, if (pch[3] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[3], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[3], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); @@ -584,8 +591,8 @@ static GpaStatus EvaluateExpression(const char* expression, if (pch[3] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[3], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[3], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); @@ -593,52 +600,55 @@ static GpaStatus EvaluateExpression(const char* expression, assert(stack.size() >= static_cast(value_count)); SumN(stack, value_count); } - else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 's') && (tolower(pch[4]) == 'u') && (tolower(pch[5]) == 'm') && ((pch[6] == '\0') || isdigit(pch[6]))) + else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 's') && (tolower(pch[4]) == 'u') && + (tolower(pch[5]) == 'm') && ((pch[6] == '\0') || isdigit(pch[6]))) { // VecSumN long value_count = 2; if (pch[6] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[6], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[6], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. + assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. VecSumN(stack, value_count); } - else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 's') && (tolower(pch[4]) == 'u') && (tolower(pch[5]) == 'b') && ((pch[6] == '\0') || isdigit(pch[6]))) + else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 's') && (tolower(pch[4]) == 'u') && + (tolower(pch[5]) == 'b') && ((pch[6] == '\0') || isdigit(pch[6]))) { // VecSubN long value_count = 2; if (pch[6] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[6], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[6], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. + assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. VecSubN(stack, value_count); } - else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 'd') && (tolower(pch[4]) == 'i') && (tolower(pch[5]) == 'v') && ((pch[6] == '\0') || isdigit(pch[6]))) + else if ((tolower(pch[0]) == 'v') && (tolower(pch[1]) == 'e') && (tolower(pch[2]) == 'c') && (tolower(pch[3]) == 'd') && (tolower(pch[4]) == 'i') && + (tolower(pch[5]) == 'v') && ((pch[6] == '\0') || isdigit(pch[6]))) { // VecDivN long value_count = 2; if (pch[6] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[6], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[6], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. + assert(stack.size() >= static_cast(value_count) * 2); // 2 vectors of value_count entries. VecDivN(stack, value_count); } else if ((tolower(pch[0]) == 'a') && (tolower(pch[1]) == 'v') && (tolower(pch[2]) == 'g') && ((pch[3] == '\0') || isdigit(pch[3]))) @@ -648,8 +658,8 @@ static GpaStatus EvaluateExpression(const char* expression, if (pch[3] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[3], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[3], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); @@ -657,58 +667,58 @@ static GpaStatus EvaluateExpression(const char* expression, assert(stack.size() >= static_cast(value_count)); AvgN(stack, value_count); } - else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && (tolower(pch[5]) == 'r') - && (tolower(pch[6]) == 's') && (tolower(pch[7]) == 'u') && (tolower(pch[8]) == 'b') - && ((pch[9] == '\0') || isdigit(pch[9]))) + else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && + (tolower(pch[5]) == 'r') && (tolower(pch[6]) == 's') && (tolower(pch[7]) == 'u') && (tolower(pch[8]) == 'b') && + ((pch[9] == '\0') || isdigit(pch[9]))) { // ScalarSubN long value_count = 2; if (pch[9] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[9], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[9], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. + assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. ScalarSubN(stack, value_count); } - else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && (tolower(pch[5]) == 'r') - && (tolower(pch[6]) == 'd') && (tolower(pch[7]) == 'i') && (tolower(pch[8]) == 'v') - && ((pch[9] == '\0') || isdigit(pch[9]))) + else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && + (tolower(pch[5]) == 'r') && (tolower(pch[6]) == 'd') && (tolower(pch[7]) == 'i') && (tolower(pch[8]) == 'v') && + ((pch[9] == '\0') || isdigit(pch[9]))) { // ScalarDivN long value_count = 2; if (pch[9] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[9], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[9], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. + assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. ScalarDivN(stack, value_count); } - else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && (tolower(pch[5]) == 'r') - && (tolower(pch[6]) == 'm') && (tolower(pch[7]) == 'u') && (tolower(pch[8]) == 'l') - && ((pch[9] == '\0') || isdigit(pch[9]))) + else if ((tolower(pch[0]) == 's') && (tolower(pch[1]) == 'c') && (tolower(pch[2]) == 'a') && (tolower(pch[3]) == 'l') && (tolower(pch[4]) == 'a') && + (tolower(pch[5]) == 'r') && (tolower(pch[6]) == 'm') && (tolower(pch[7]) == 'u') && (tolower(pch[8]) == 'l') && + ((pch[9] == '\0') || isdigit(pch[9]))) { // ScalarMulN long value_count = 2; if (pch[9] != '\0') { char* endptr = nullptr; - errno = 0; - value_count = std::strtol(&pch[9], &endptr, 10); + errno = 0; + value_count = std::strtol(&pch[9], &endptr, 10); assert(endptr != nullptr); assert(value_count > 0); assert(errno == 0); } - assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. + assert(stack.size() >= static_cast(value_count) + 1); // 1 scalar + 1 vector of value_count entries. ScalarMulN(stack, value_count); } else @@ -722,7 +732,7 @@ static GpaStatus EvaluateExpression(const char* expression, #endif UNREFERENCED_PARAMETER(scan_result); - if(1 != scan_result) + if (1 != scan_result) { GPA_LOG_DEBUG_ERROR("Failed for expression %s", expression); } diff --git a/source/gpu_perf_api_counter_generator/gpa_hardware_counters.h b/source/gpu_perf_api_counter_generator/gpa_hardware_counters.h index dc11e7f3..94ce778c 100644 --- a/source/gpu_perf_api_counter_generator/gpa_hardware_counters.h +++ b/source/gpu_perf_api_counter_generator/gpa_hardware_counters.h @@ -237,7 +237,6 @@ class GpaHardwareCounters hardware_exposed_counters_.clear(); hardware_exposed_counter_groups_ = nullptr; - hardware_exposed_counter_group_count_ = 0; hardware_exposed_counters_list_.clear(); hardware_exposed_counter_internal_indices_list_.clear(); hardware_exposed_counters_generated_ = false; @@ -976,7 +975,6 @@ class GpaHardwareCounters std::vector*> hardware_exposed_counters_; ///< List of counter groups as defined by the list of hardware exposed counters counters in each group. GpaCounterGroupExposedCounterDesc* hardware_exposed_counter_groups_; ///< List of hardware exposed counter groups. - unsigned int hardware_exposed_counter_group_count_; ///< The number of hardware exposed counter groups. std::vector hardware_exposed_counters_list_; ///< Vector of hardware exposed counters. std::vector hardware_exposed_counter_internal_indices_list_; ///< Internal hardware index for the hardware exposed counter. bool hardware_exposed_counters_generated_; ///< Indicates that the hardware exposed counters have been generated. diff --git a/source/gpu_perf_api_counters/CMakeLists.txt b/source/gpu_perf_api_counters/CMakeLists.txt index ebe067bd..da8933e2 100644 --- a/source/gpu_perf_api_counters/CMakeLists.txt +++ b/source/gpu_perf_api_counters/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_counters/gpa_counter_context_handler.cc b/source/gpu_perf_api_counters/gpa_counter_context_handler.cc index c910f224..3d1b8ed3 100644 --- a/source/gpu_perf_api_counters/gpa_counter_context_handler.cc +++ b/source/gpu_perf_api_counters/gpa_counter_context_handler.cc @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2020 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief Implements Gpa counter context related functionality. @@ -42,10 +42,8 @@ GpaCounterContextHandler::GpaCounterContextHandler(const GpaApiType& api_type, const GpaCounterContextHardwareInfo& gpa_counter_context_hardware_info, - const GpaOpenContextFlags& context_flags, - const GpaUInt8& generate_asic_specific_counters) + const GpaOpenContextFlags& context_flags) : gpa_api_type_(api_type) - , asic_specific_(generate_asic_specific_counters) , gpa_open_context_flags_(context_flags) , initialized_(false) , gpa_counter_accessor_(nullptr) @@ -110,7 +108,7 @@ bool GpaCounterContextHandler::InitCounters() { const GpaStatus status = GenerateCounters( gpa_api_type_, - vendorId, deviceId, revisionId, gpa_open_context_flags_, asic_specific_, &gpa_counter_accessor_, &gpa_counter_scheduler_); + vendorId, deviceId, revisionId, gpa_open_context_flags_, &gpa_counter_accessor_, &gpa_counter_scheduler_); if (kGpaStatusOk == status) { @@ -195,14 +193,13 @@ GpaCounterContextManager::~GpaCounterContextManager() GpaStatus GpaCounterContextManager::OpenCounterContext(const GpaApiType& api_type, const GpaCounterContextHardwareInfo& gpa_counter_context_hardware_info, const GpaOpenContextFlags& context_flags, - const GpaUInt8& generate_asic_specific_counters, GpaCounterContext* gpa_counter_context) { Init(api_type); GpaCounterContextHandler* gpa_new_counter_context = new (std::nothrow) GpaCounterContextHandler(api_type, - gpa_counter_context_hardware_info, context_flags, generate_asic_specific_counters); + gpa_counter_context_hardware_info, context_flags); if (nullptr != gpa_new_counter_context) { diff --git a/source/gpu_perf_api_counters/gpa_counter_context_handler.h b/source/gpu_perf_api_counters/gpa_counter_context_handler.h index 0d413d0a..62d12b16 100644 --- a/source/gpu_perf_api_counters/gpa_counter_context_handler.h +++ b/source/gpu_perf_api_counters/gpa_counter_context_handler.h @@ -23,11 +23,9 @@ class GpaCounterContextHandler /// @param [in] api_type API. /// @param [in] gpa_counter_context_hardware_info Context hardware info. /// @param [in] context_flags Context flags. - /// @param [in] generate_asic_specific_counters Flag indicating asic specific counter generation is required. GpaCounterContextHandler(const GpaApiType& api_type, const GpaCounterContextHardwareInfo& gpa_counter_context_hardware_info, - const GpaOpenContextFlags& context_flags, - const GpaUInt8& generate_asic_specific_counters); + const GpaOpenContextFlags& context_flags); /// Initializes the counter for the context. /// @@ -52,7 +50,6 @@ class GpaCounterContextHandler private: GpaApiType gpa_api_type_; ///< API type. GpaHwInfo gpa_hw_info_; ///< Hardware info. - bool asic_specific_; ///< Asic specific flag. GpaOpenContextFlags gpa_open_context_flags_; ///< Context flags. bool initialized_; ///< Flag indicating context initialization status. IGpaCounterAccessor* gpa_counter_accessor_; ///< Context counter accessor. @@ -101,14 +98,12 @@ class GpaCounterContextManager /// @param [in] api_type the api whose available counters are requested. /// @param [in] gpa_counter_context_hardware_info counter context hardware info. /// @param [in] context_flags Flags used to initialize the context. Should be a combination of GpaOpenContextBits. - /// @param [in] generate_asic_specific_counters Flag that indicates whether the counters should be ASIC specific, if available. /// @param [out] gpa_counter_context Unique identifier of the opened virtual context. /// /// @return The GPA result status of the operation. kGpaStatusOk is returned if the operation is successful. GpaStatus OpenCounterContext(const GpaApiType& api_type, const GpaCounterContextHardwareInfo& gpa_counter_context_hardware_info, const GpaOpenContextFlags& context_flags, - const GpaUInt8& generate_asic_specific_counters, GpaCounterContext* gpa_counter_context); /// Returns the counter accessor for the given context. diff --git a/source/gpu_perf_api_counters/gpu_perf_api_counters.cc b/source/gpu_perf_api_counters/gpu_perf_api_counters.cc index cca26ea5..e0dde90b 100644 --- a/source/gpu_perf_api_counters/gpu_perf_api_counters.cc +++ b/source/gpu_perf_api_counters/gpu_perf_api_counters.cc @@ -104,7 +104,7 @@ GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibGetFuncTable(void* gpa_counter GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibOpenCounterContext(GpaApiType api, GpaCounterContextHardwareInfo gpa_counter_context_hardware_info, GpaOpenContextFlags context_flags, - GpaUInt8 generate_asic_specific_counters, + GpaUInt8 generate_asic_specific_counters_deprecated, GpaCounterContext* gpa_virtual_context) { if (nullptr == gpa_virtual_context) @@ -112,15 +112,20 @@ GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibOpenCounterContext(GpaApiType return kGpaStatusErrorNullPointer; } + if (generate_asic_specific_counters_deprecated != TRUE) + { + // GPA always generates ASIC-Specific counters now, so passing in anything other than TRUE (1) is an invalid parameter. + return kGpaStatusErrorInvalidParameter; + } + if ((context_flags & kGpaOpenContextHideDerivedCountersBit) && !(context_flags & kGpaOpenContextEnableHardwareCountersBit)) { - GPA_LOG_ERROR("Requested no counters. Specify a different GpaOpenContextFlags argument."); return kGpaStatusErrorInvalidParameter; } return GpaCounterContextManager::Instance()->OpenCounterContext( api, - gpa_counter_context_hardware_info, context_flags, generate_asic_specific_counters, gpa_virtual_context); + gpa_counter_context_hardware_info, context_flags, gpa_virtual_context); } GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibCloseCounterContext(const GpaCounterContext gpa_virtual_context) diff --git a/source/gpu_perf_api_dx/CMakeLists.txt b/source/gpu_perf_api_dx/CMakeLists.txt index d66031e8..ee5f7b9a 100644 --- a/source/gpu_perf_api_dx/CMakeLists.txt +++ b/source/gpu_perf_api_dx/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_dx11/CMakeLists.txt b/source/gpu_perf_api_dx11/CMakeLists.txt index c21d702a..715385b8 100644 --- a/source/gpu_perf_api_dx11/CMakeLists.txt +++ b/source/gpu_perf_api_dx11/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_dx12/CMakeLists.txt b/source/gpu_perf_api_dx12/CMakeLists.txt index 4eba1959..f279e9fb 100644 --- a/source/gpu_perf_api_dx12/CMakeLists.txt +++ b/source/gpu_perf_api_dx12/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_dx12/dx12_gpa_command_list.cc b/source/gpu_perf_api_dx12/dx12_gpa_command_list.cc index 4967dbc6..a269b85c 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_command_list.cc +++ b/source/gpu_perf_api_dx12/dx12_gpa_command_list.cc @@ -148,7 +148,6 @@ bool Dx12GpaCommandList::BeginSampleRequest(ClientSampleId client_sample_id, Gpa DriverSampleId driver_sample_id = 0; GpaCounterSource counter_source = GetPass()->GetCounterSource(); - if (GpaCounterSource::kHardware == counter_source) { if (OpenHwSample(client_sample_id, &driver_sample_id)) @@ -277,24 +276,23 @@ bool Dx12GpaCommandList::OpenHwSample(ClientSampleId client_sample_id, DriverSam if (has_any_hardware_counters_) { + const Dx12GpaSampleConfig& sample_config = reinterpret_cast(GetPass())->GetAmdExtSampleConfig(); if (use_pre2240_config_) { // Pre-22.40 config struct. - auto older_config = reinterpret_cast(GetPass())->GetPre2240DriverExtSampleConfig(); - - *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, *(AmdExtGpaSampleConfig*)(&older_config)); + AmdExtGpaSampleConfigPre2240 older_config = sample_config.GetPre2240DriverExtSampleConfig(); + *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, *(reinterpret_cast(&older_config))); } else if (use_pre1850_config_) { // Pre-18.50 config struct. - auto older_config = reinterpret_cast(GetPass())->GetPre1850DriverExtSampleConfig(); - - *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, *(AmdExtGpaSampleConfig*)(&older_config)); + AmdExtGpaSampleConfigPre1850 older_config = sample_config.GetPre1850DriverExtSampleConfig(); + *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, *(reinterpret_cast(&older_config))); } else { // Latest config struct. - *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, reinterpret_cast(GetPass())->GetDriverExtSampleConfig()); + *driver_sample_id = amd_ext_session_->BeginSample(cmd_list_, sample_config.GetDriverExtSampleConfig()); } if (*driver_sample_id == kSInvalidSampleIndex) @@ -330,20 +328,6 @@ bool Dx12GpaCommandList::CloseHwSample() const return success; } -bool Dx12GpaCommandList::OpenSwSample(ClientSampleId client_sample_id, DriverSampleId* driver_sample_id) const -{ - GPA_STUB_FUNCTION; - UNREFERENCED_PARAMETER(client_sample_id); - UNREFERENCED_PARAMETER(driver_sample_id); - return true; -} - -bool Dx12GpaCommandList::CloseSwSample() -{ - GPA_STUB_FUNCTION; - return true; -} - void Dx12GpaCommandList::ReleaseNonGpaResources() { if (!is_non_gpa_resource_released_) @@ -353,10 +337,14 @@ void Dx12GpaCommandList::ReleaseNonGpaResources() cmd_list_ = nullptr; is_non_gpa_resource_released_ = true; - // We won't rely on Release() to delete extension session objects because of an issue in older drivers, - // rather we will use DestroyGpaSession to delete the session object. Dx12GpaSession* dx12_gpa_session = reinterpret_cast(GetParentSession()); - dx12_gpa_session->GetAmdExtInterface()->DestroyGpaSession(amd_ext_session_); + ULONG session_ref_count = amd_ext_session_->Release(); + if (session_ref_count != 0) + { + // Very early drivers did not properly support Release() on the session, + // as a fallback, use DestroyGpaSession to delete the session object. + dx12_gpa_session->GetAmdExtInterface()->DestroyGpaSession(amd_ext_session_); + } amd_ext_session_ = nullptr; for (auto iter = secondary_sample_amd_ext_session_map_.begin(); iter != secondary_sample_amd_ext_session_map_.end(); ++iter) diff --git a/source/gpu_perf_api_dx12/dx12_gpa_command_list.h b/source/gpu_perf_api_dx12/dx12_gpa_command_list.h index fbb2b7ae..f6fc032a 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_command_list.h +++ b/source/gpu_perf_api_dx12/dx12_gpa_command_list.h @@ -109,24 +109,11 @@ class GPA_NOT_THREAD_SAFE_OBJECT Dx12GpaCommandList : public GpaCommandList /// @return true upon successful Operation otherwise false. bool OpenHwSample(ClientSampleId client_sample_id, DriverSampleId* driver_sample_id) const; - /// @brief Creates a hardware sample. - /// - /// @param [in] client_sample_id Client sample id. - /// @param [out] driver_sample_id Pointer to write the driver generated sample id. - /// - /// @return True upon successful operation otherwise false. - bool OpenSwSample(ClientSampleId client_sample_id, DriverSampleId* driver_sample_id = nullptr) const; - /// @brief Closes the previously opened hardware sample. /// /// @return True upon successful operation otherwise false. bool CloseHwSample() const; - /// @brief Closes the previously opened software sample. - /// - /// @return True upon successful operation otherwise false. - bool CloseSwSample(); - /// Type alias for set of client sample id for bundle samples. using BundleSamplesOnPrimaryCmd = std::unordered_set; diff --git a/source/gpu_perf_api_dx12/dx12_gpa_pass.cc b/source/gpu_perf_api_dx12/dx12_gpa_pass.cc index 40fe5285..9a6ae94d 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_pass.cc +++ b/source/gpu_perf_api_dx12/dx12_gpa_pass.cc @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief DX12 GPA Pass Object Implementation @@ -18,10 +18,11 @@ Dx12GpaPass::Dx12GpaPass(IGpaSession* gpa_session, PassIndex pass_index, GpaCounterSource counter_source, CounterList* pass_counters) : GpaPass(gpa_session, pass_index, counter_source, pass_counters) - , amd_ext_sample_config_() - , is_sample_config_initialized_(false) { - InitializeSampleConfig(); + if (!amd_ext_sample_config_.Initialize(gpa_session, GetCounterSource(), counter_list_, this, IsTimingPass())) + { + GPA_LOG_ERROR("Sample configuration failed to initialize for pass %u.", pass_index); + } } GpaSample* Dx12GpaPass::CreateApiSpecificSample(IGpaCommandList* cmd_list, GpaSampleType sample_type, ClientSampleId sample_id) @@ -232,189 +233,9 @@ bool Dx12GpaPass::CopySecondarySamples(std::vector client_sample Dx12GpaPass::~Dx12GpaPass() { - if (AmdExtGpaSampleType::Timing != amd_ext_sample_config_.type) - { - delete[] amd_ext_sample_config_.perfCounters.pIds; - } - ResetPass(); } -void Dx12GpaPass::InitializeSampleConfig() -{ - if (!is_sample_config_initialized_ && GpaCounterSource::kHardware == GetCounterSource()) - { - std::vector counter_ids; - - IGpaCounterAccessor* counter_accessor = GpaContextCounterMediator::Instance()->GetCounterAccessor(GetGpaSession()->GetParentContext()); - const GpaHardwareCounters* hardware_counters = counter_accessor->GetHardwareCounters(); - - if (!counter_list_->empty()) - { - if (IsTimingPass()) - { - amd_ext_sample_config_.type = AmdExtGpaSampleType::Timing; - amd_ext_sample_config_.flags.u32All = 1; - amd_ext_sample_config_.sqShaderMask = PerfShaderMaskAll; - amd_ext_sample_config_.perfCounters = {}; - amd_ext_sample_config_.sqtt = {}; - - if (hardware_counters->IsBottomOfPipeCounterIndex(counter_list_->at(0))) - { - amd_ext_sample_config_.timing.preSample = AmdExtHwPipePoint::HwPipeBottom; - } - else if (hardware_counters->IsTopOfPipeCounterIndex(counter_list_->at(0))) - { - amd_ext_sample_config_.timing.preSample = AmdExtHwPipePoint::HwPipeTop; - } - - amd_ext_sample_config_.timing.postSample = AmdExtHwPipePoint::HwPipeBottom; - EnableCounterForPass(counter_list_->at(0)); - } - else - { - AmdExtPerfExperimentShaderFlags mask_value = PerfShaderMaskAll; - - amd_ext_sample_config_.type = AmdExtGpaSampleType::Cumulative; - amd_ext_sample_config_.flags.u32All = 0; - - // Add all desired counters. - for (size_t i = 0; i < counter_list_->size(); i++) - { - const GpaHardwareCounterDescExt* counter = &hardware_counters->hardware_counters_.at(counter_list_->at(i)); - AmdExtGpuBlock block = static_cast(counter->group_id_driver); - UINT32 instance = static_cast(hardware_counters->internal_counter_groups_[counter->group_index].block_instance); - UINT32 event_id = static_cast(counter->hardware_counters->counter_index_in_group); - - if (reinterpret_cast(GetGpaSession()->GetParentContext())->GetNumInstances(block) <= instance) - { - DisableCounterForPass(counter_list_->at(i)); - GPA_LOG_DEBUG_MESSAGE("Disabling counter at index %s as number of block instances is less than the current instance.", i); - continue; - } - - if (reinterpret_cast(GetGpaSession()->GetParentContext())->GetMaxEventId(block) <= event_id) - { - DisableCounterForPass(counter_list_->at(i)); - GPA_LOG_DEBUG_MESSAGE("Disabling counter at index %s as max event ID in context is less than the current event ID.", i); - continue; - } - - // Validate requested counter vs number of actual hardware counters and group index. - uint32_t group_index = counter->group_index; - - uint32_t counters = 0; - - if (group_index < static_cast(hardware_counters->internal_counter_groups_.size())) - { - counters = hardware_counters->internal_counter_groups_[group_index].num_counters; - } - else - { - counters = hardware_counters->additional_groups_[group_index- static_cast(hardware_counters->internal_counter_groups_.size())].num_counters; - } - - if (counter->hardware_counters->counter_index_in_group > counters) - { - assert(counter->hardware_counters->counter_index_in_group <= counters); - DisableCounterForPass(counter_list_->at(i)); - continue; - } - - if (group_index > (static_cast(hardware_counters->internal_counter_groups_.size()) + hardware_counters->additional_group_count_)) - { - assert(group_index <= (static_cast(hardware_counters->internal_counter_groups_.size()) + hardware_counters->additional_group_count_)); - DisableCounterForPass(counter_list_->at(i)); - continue; - } - - // Add counter to valid vector. - AmdExtPerfCounterId this_counter = {block, instance, event_id}; - counter_ids.push_back(this_counter); - - // If dealing with an SQ or SqWgp counter, check if the the stage mask needs to be set. - if (counter->group_index >= hardware_counters->sq_counter_groups_[0].group_index && - counter->group_index <= hardware_counters->sq_counter_groups_[hardware_counters->sq_group_count_ - 1].group_index) - { - GpaSqShaderStage stage = kSqAll; - - for (unsigned int j = 0; j < hardware_counters->sq_group_count_ - 1; j++) - { - if (hardware_counters->sq_counter_groups_[j].group_index == counter->group_index) - { - stage = hardware_counters->sq_counter_groups_[j].sq_shader_stage; - break; - } - } - - if (kSqEs == stage) - { - mask_value = PerfShaderMaskEs; - } - else if (kSqGs == stage) - { - mask_value = PerfShaderMaskGs; - } - else if (kSqVs == stage) - { - mask_value = PerfShaderMaskVs; - } - else if (kSqPs == stage) - { - mask_value = PerfShaderMaskPs; - } - else if (kSqLs == stage) - { - mask_value = PerfShaderMaskLs; - } - else if (kSqHs == stage) - { - mask_value = PerfShaderMaskHs; - } - else if (kSqCs == stage) - { - mask_value = PerfShaderMaskCs; - } - } - - EnableCounterForPass(counter_list_->at(i)); - } - - amd_ext_sample_config_.perfCounters.numCounters = GetNumEnabledCountersForPass(); - AmdExtPerfCounterId* amd_ext_perf_counter_id = new (std::nothrow) AmdExtPerfCounterId[counter_list_->size()]; - - if (nullptr != amd_ext_perf_counter_id) - { - memcpy(amd_ext_perf_counter_id, counter_ids.data(), sizeof(AmdExtPerfCounterId) * counter_ids.size()); - } - - amd_ext_sample_config_.perfCounters.pIds = amd_ext_perf_counter_id; - amd_ext_sample_config_.perfCounters.spmTraceSampleInterval = 0; - amd_ext_sample_config_.perfCounters.gpuMemoryLimit = 0; - amd_ext_sample_config_.sqtt = {}; - amd_ext_sample_config_.timing = {}; - - // Set SQ shader mask. - amd_ext_sample_config_.flags.sqShaderMask = 1; - amd_ext_sample_config_.sqShaderMask = mask_value; - - // Set SqWgp shader mask to the same value. - // GPA's counter scheduler will make sure the same wave types get scheduled in the same passes. - amd_ext_sample_config_.flags.sqWgpShaderMask = 1; - amd_ext_sample_config_.sqWgpShaderMask = mask_value; - } - - // Insert L2 cache invalidate and flush around counter sample. - if (GetGpaSession()->GetParentContext()->IsInvalidateAndFlushL2CacheEnabled()) - { - amd_ext_sample_config_.flags.cacheFlushOnCounterCollection = 1; - } - - is_sample_config_initialized_ = true; - } - } -} - void Dx12GpaPass::ResetPass() const { LockCommandListMutex(); @@ -428,3 +249,7 @@ void Dx12GpaPass::ResetPass() const UnlockCommandListMutex(); } +const Dx12GpaSampleConfig& Dx12GpaPass::GetAmdExtSampleConfig() +{ + return amd_ext_sample_config_; +} diff --git a/source/gpu_perf_api_dx12/dx12_gpa_pass.h b/source/gpu_perf_api_dx12/dx12_gpa_pass.h index fd521d79..6a728ba1 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_pass.h +++ b/source/gpu_perf_api_dx12/dx12_gpa_pass.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief DX12 GPA Pass Object Header @@ -54,49 +54,20 @@ class Dx12GpaPass : public GpaPass Dx12GpaCommandList* dx12_primary_gpa_cmd_list, Dx12GpaCommandList* dx12_secondary_gpa_cmd_list); - /// @brief Returns the current sample config for the set of counters in the pass. + /// @brief Returns the sample config for the set of counters in the pass. /// /// @return AMD extension sample config for the set of counters in the pass. - const AmdExtGpaSampleConfig& GetDriverExtSampleConfig() const - { - return amd_ext_sample_config_; - } - - /// @brief Returns older sample config for the set of counters in the pass. - /// - /// @return AMD extension sample config for the set of counters in the pass. - AmdExtGpaSampleConfigPre1850 GetPre1850DriverExtSampleConfig() const - { - AmdExtGpaSampleConfigPre1850 older_config; - older_config = amd_ext_sample_config_; - return older_config; - } - - /// @brief Returns older sample config for the set of counters in the pass. - /// - /// @return AMD extension sample config for the set of counters in the pass. - AmdExtGpaSampleConfigPre2240 GetPre2240DriverExtSampleConfig() const - { - AmdExtGpaSampleConfigPre2240 older_config; - older_config = amd_ext_sample_config_; - return older_config; - } + const Dx12GpaSampleConfig& Dx12GpaPass::GetAmdExtSampleConfig(); /// @brief Destructor. virtual ~Dx12GpaPass(); private: - /// @brief Initializes the sample config for the pass if pass counter source is hardware. - void InitializeSampleConfig(); - /// @brief Removes the irrelevant resources. void ResetPass() const; - /// AMD Extension configuration for hardware samples. - AmdExtGpaSampleConfig amd_ext_sample_config_; - - /// Flag indicating whether the sample config is initialized or not for the hardware samples. - bool is_sample_config_initialized_; + /// AMD extension sample configuration. + Dx12GpaSampleConfig amd_ext_sample_config_; }; #endif // GPU_PERF_API_DX12_DX12_GPA_PASS_H_ diff --git a/source/gpu_perf_api_dx12/dx12_gpa_sample_config.cc b/source/gpu_perf_api_dx12/dx12_gpa_sample_config.cc index 5577e9ab..bbd1454b 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_sample_config.cc +++ b/source/gpu_perf_api_dx12/dx12_gpa_sample_config.cc @@ -1,7 +1,256 @@ //============================================================================== -// Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief DX12 GPA Sample Configuration Header. //============================================================================== +#include "dx12_gpa_sample_config.h" + +#include "gpa_context_counter_mediator.h" +#include "gpa_hardware_counters.h" +#include "dx12_gpa_session.h" +#include "dx12_gpa_context.h" +#include "ADLUtil.h" + +Dx12GpaSampleConfig::~Dx12GpaSampleConfig() +{ + if (amd_ext_sample_config_.perfCounters.pIds != nullptr) + { + delete[] amd_ext_sample_config_.perfCounters.pIds; + amd_ext_sample_config_.perfCounters.pIds = nullptr; + } +} + +bool Dx12GpaSampleConfig::Initialize(IGpaSession* session, + GpaCounterSource counter_source, + const CounterList* counter_list, + GpaPass* gpa_pass, + bool is_timing_pass) +{ + assert(session); + if (nullptr == session) + { + GPA_LOG_ERROR("Null session supplied to Dx12GpaSampleConfig::Initialize."); + return false; + } + + if (is_sample_config_initialized_) + { + return true; + } + + amd_ext_sample_config_ = {}; + + counter_result_entries_.clear(); + + uint32_t sample_offset = 0; + + sample_type_ = session->GetSampleType(); + + if (GpaCounterSource::kHardware == counter_source) + { + if (kGpaSessionSampleTypeDiscreteCounter == sample_type_ && nullptr == gpa_pass) + { + GPA_LOG_ERROR("Configuring discrete counters requires a GpaPass object."); + return false; + } + + if (nullptr == counter_list) + { + GPA_LOG_ERROR("Configuring discrete counters requires a list of counters."); + return false; + } + + std::vector counter_ids; + + IGpaCounterAccessor* counter_accessor = GpaContextCounterMediator::Instance()->GetCounterAccessor(session->GetParentContext()); + const GpaHardwareCounters* hardware_counters = counter_accessor->GetHardwareCounters(); + + if (!counter_list->empty()) + { + if (is_timing_pass) + { + amd_ext_sample_config_.type = AmdExtGpaSampleType::Timing; + amd_ext_sample_config_.timing.preSample = AmdExtHwPipePoint::HwPipeBottom; + + if (hardware_counters->IsTopOfPipeCounterIndex(counter_list->at(0))) + { + amd_ext_sample_config_.timing.preSample = AmdExtHwPipePoint::HwPipeTop; + } + else if (hardware_counters->IsBottomOfPipeCounterIndex(counter_list->at(0))) + { + amd_ext_sample_config_.timing.preSample = AmdExtHwPipePoint::HwPipeBottom; + } + + amd_ext_sample_config_.timing.postSample = AmdExtHwPipePoint::HwPipeBottom; + gpa_pass->EnableCounterForPass(counter_list->at(0)); + } + else + { + AmdExtPerfExperimentShaderFlags mask_value = PerfShaderMaskAll; + + amd_ext_sample_config_.type = AmdExtGpaSampleType::Cumulative; + amd_ext_sample_config_.flags.u32All = 0; + + // Add all desired counters. + for (size_t i = 0; i < counter_list->size(); i++) + { + const GpaUInt32 global_counter_index = (GpaUInt32)counter_list->at(i); + const auto hardware_counter_iter = hardware_counters->hardware_counters_.find(global_counter_index); + if (hardware_counter_iter == hardware_counters->hardware_counters_.cend()) + { + GPA_LOG_ERROR("Failed to locate hardware counter using global index %d.", global_counter_index); + return false; + } + + const GpaHardwareCounterDescExt* hw_counter_desc = &(hardware_counter_iter->second); + AmdExtGpuBlock block = static_cast(hw_counter_desc->group_id_driver); + UINT32 instance = static_cast(hardware_counters->internal_counter_groups_[hw_counter_desc->group_index].block_instance); + UINT32 event_id = static_cast(hw_counter_desc->hardware_counters->counter_index_in_group); + + if (reinterpret_cast(session->GetParentContext())->GetNumInstances(block) <= instance) + { + assert(nullptr != gpa_pass); + gpa_pass->DisableCounterForPass(counter_list->at(i)); + GPA_LOG_DEBUG_MESSAGE("Disabling counter at index %s as number of block instances is less than the current instance.", i); + counter_result_entries_.push_back(CounterResultEntry{counter_list->at(i), 0, 0}); + continue; + } + + if (reinterpret_cast(session->GetParentContext())->GetMaxEventId(block) <= event_id) + { + assert(nullptr != gpa_pass); + gpa_pass->DisableCounterForPass(counter_list->at(i)); + GPA_LOG_DEBUG_MESSAGE("Disabling counter at index %s as max event ID in context is less than the current event ID.", i); + counter_result_entries_.push_back(CounterResultEntry{counter_list->at(i), 0, 0}); + continue; + } + + // Validate requested counter vs number of actual hardware counters and group index. + const uint32_t group_index = hw_counter_desc->group_index; + + uint32_t counters = 0; + + if (group_index < hardware_counters->internal_counter_groups_.size()) + { + counters = hardware_counters->internal_counter_groups_[group_index].num_counters; + } + else + { + counters = hardware_counters->additional_groups_[group_index - hardware_counters->internal_counter_groups_.size()].num_counters; + } + + if (hw_counter_desc->hardware_counters->counter_index_in_group > counters) + { + assert(hw_counter_desc->hardware_counters->counter_index_in_group <= counters); + assert(nullptr != gpa_pass); + gpa_pass->DisableCounterForPass(counter_list->at(i)); + GPA_LOG_ERROR("Disabling counter at index %s as the counter index in the group does not correspond to a known counter.", i); + counter_result_entries_.push_back(CounterResultEntry{counter_list->at(i), 0, 0}); + continue; + } + + if (group_index > (hardware_counters->internal_counter_groups_.size() + hardware_counters->additional_group_count_)) + { + assert(group_index <= (hardware_counters->internal_counter_groups_.size() + hardware_counters->additional_group_count_)); + assert(nullptr != gpa_pass); + gpa_pass->DisableCounterForPass(counter_list->at(i)); + GPA_LOG_ERROR("Disabling counter at index %s as the counter's group index does not correspond to a known group.", i); + counter_result_entries_.push_back(CounterResultEntry{counter_list->at(i), 0, 0}); + continue; + } + + // Add counter to valid vector + AmdExtPerfCounterId this_counter = {block, instance, event_id}; + counter_ids.push_back(this_counter); + + // If dealing with an SQ counter, check if the stage mask needs to be set + if (hw_counter_desc->group_index >= hardware_counters->sq_counter_groups_[0].group_index && + hw_counter_desc->group_index <= hardware_counters->sq_counter_groups_[hardware_counters->sq_group_count_ - 1].group_index) + { + GpaSqShaderStage stage = kSqAll; + + for (unsigned int j = 0; j < hardware_counters->sq_group_count_ - 1; j++) + { + if (hardware_counters->sq_counter_groups_[j].group_index == hw_counter_desc->group_index) + { + stage = hardware_counters->sq_counter_groups_[j].sq_shader_stage; + break; + } + } + + if (stage == kSqEs) + { + mask_value = PerfShaderMaskEs; + } + else if (stage == kSqGs) + { + mask_value = PerfShaderMaskGs; + } + else if (stage == kSqVs) + { + mask_value = PerfShaderMaskVs; + } + else if (stage == kSqPs) + { + mask_value = PerfShaderMaskPs; + } + else if (stage == kSqLs) + { + mask_value = PerfShaderMaskLs; + } + else if (stage == kSqHs) + { + mask_value = PerfShaderMaskHs; + } + else if (stage == kSqCs) + { + mask_value = PerfShaderMaskCs; + } + } + + assert(nullptr != gpa_pass); + gpa_pass->EnableCounterForPass(counter_list->at(i)); + + counter_result_entries_.push_back(CounterResultEntry{counter_list->at(i), sample_offset, 1}); + + ++sample_offset; + } + + amd_ext_sample_config_.perfCounters.numCounters = static_cast(counter_ids.size()); + AmdExtPerfCounterId* amd_ext_perf_counter_id = new (std::nothrow) AmdExtPerfCounterId[counter_ids.size()]; + + if (nullptr != amd_ext_perf_counter_id) + { + memcpy(amd_ext_perf_counter_id, counter_ids.data(), sizeof(AmdExtPerfCounterId) * counter_ids.size()); + } + + amd_ext_sample_config_.perfCounters.pIds = amd_ext_perf_counter_id; + amd_ext_sample_config_.perfCounters.spmTraceSampleInterval = 0; + amd_ext_sample_config_.perfCounters.gpuMemoryLimit = 0; + amd_ext_sample_config_.sqtt = {}; + amd_ext_sample_config_.timing = {}; + + // set shader mask + amd_ext_sample_config_.flags.sqShaderMask = 1; + amd_ext_sample_config_.sqShaderMask = mask_value; + + amd_ext_sample_config_.flags.sqWgpShaderMask = 1; + amd_ext_sample_config_.sqWgpShaderMask = mask_value; + } + + // Insert L2 cache invalidate and flush around counter sample + if (session->GetParentContext()->IsInvalidateAndFlushL2CacheEnabled()) + { + amd_ext_sample_config_.flags.cacheFlushOnCounterCollection = 1; + } + + amd_ext_sample_config_.flags.sampleInternalOperations = 1; + + is_sample_config_initialized_ = true; + } + } + + return true; +} diff --git a/source/gpu_perf_api_dx12/dx12_gpa_sample_config.h b/source/gpu_perf_api_dx12/dx12_gpa_sample_config.h index 78225af7..fa8eb264 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_sample_config.h +++ b/source/gpu_perf_api_dx12/dx12_gpa_sample_config.h @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief DX12 GPA Sample Configuration Header. @@ -8,11 +8,18 @@ #ifndef GPU_PERF_API_DX12_DX12_GPA_SAMPLE_CONFIG_H_ #define GPU_PERF_API_DX12_DX12_GPA_SAMPLE_CONFIG_H_ +#include + // AMD Ext #pragma warning(push) #pragma warning(disable : 4201) #include +#include "gpa_counter_accessor_interface.h" +#include "gpa_pass.h" +#include "gpa_session_interface.h" +#include "logging.h" + /// @brief Input structure for CmdBeginGpuProfilerSample on drivers older than 18.50. /// /// Defines a set of global performance counters and/or SQ thread trace data to be sampled. @@ -89,13 +96,15 @@ struct AmdExtGpaSampleConfigPre1850 AmdExtHwPipePoint postSample; ///< The point in the GPU pipeline where the end timestamp should take place. } timing; ///< Timestamp configuration. (only valid for timing samples) - /// Translate from newer configuration to this older configuration - /// \updatedConfig[in] updated GPA sample configuration - /// \return this AmdExtGpaSampleConfigPre1850 instance - AmdExtGpaSampleConfigPre1850& operator=(const AmdExtGpaSampleConfig& updatedConfig) + /// Translate from newer configuration to this older configuration. + /// + /// @param [in] updated_config updated GPA sample configuration. + /// + /// @return This AmdExtGpaSampleConfigPre1850 instance. + AmdExtGpaSampleConfigPre1850& operator=(const AmdExtGpaSampleConfig& updated_config) { // Query type is not supported by older configuration - type = updatedConfig.type; + type = updated_config.type; if (type == AmdExtGpaSampleType::Query) { @@ -104,16 +113,16 @@ struct AmdExtGpaSampleConfigPre1850 type = AmdExtGpaSampleType::None; } - flags.u32All = updatedConfig.flags.u32All; - sqShaderMask = updatedConfig.sqShaderMask; + flags.u32All = updated_config.flags.u32All; + sqShaderMask = updated_config.sqShaderMask; - memcpy(&perfCounters, &updatedConfig.perfCounters, sizeof(perfCounters)); + memcpy(&perfCounters, &updated_config.perfCounters, sizeof(perfCounters)); // sqtt struct differs between older and newer configuration - sqtt.flags.u32All = updatedConfig.sqtt.flags.u32All; - sqtt.gpuMemoryLimit = updatedConfig.sqtt.gpuMemoryLimit; + sqtt.flags.u32All = updated_config.sqtt.flags.u32All; + sqtt.gpuMemoryLimit = updated_config.sqtt.gpuMemoryLimit; - memcpy(&timing, &updatedConfig.timing, sizeof(timing)); + memcpy(&timing, &updated_config.timing, sizeof(timing)); return *this; } @@ -244,8 +253,6 @@ class Dx12GpaSampleConfig bool Initialize(IGpaSession* session, GpaCounterSource counter_source, const CounterList* counter_list, GpaPass* gpa_pass, bool is_timing_pass); - bool UpdateSettings(const IGpaSession* gpa_session); - const AmdExtGpaSampleConfig& GetDriverExtSampleConfig() const { return amd_ext_sample_config_; @@ -274,11 +281,9 @@ class Dx12GpaSampleConfig } private: - bool UpdateSpmSettings(const IGpaSession* session); - - AmdExtGpaSampleConfig amd_ext_sample_config_; ///< AMD Extension configuration for hardware samples - bool is_sample_config_initialized_; ///< flag indicating whether the sample config is initialized or not for the hardware samples - GpaSessionSampleType sample_type_; + AmdExtGpaSampleConfig amd_ext_sample_config_; ///< AMD Extension configuration for hardware samples. + bool is_sample_config_initialized_; ///< Flag indicating whether the sample config is initialized for the hardware samples. + GpaSessionSampleType sample_type_; ///< The type of samples being collected in this configuration. std::vector counter_result_entries_; }; diff --git a/source/gpu_perf_api_dx12/dx12_gpa_session.cc b/source/gpu_perf_api_dx12/dx12_gpa_session.cc index fb938cb3..dc4216c9 100644 --- a/source/gpu_perf_api_dx12/dx12_gpa_session.cc +++ b/source/gpu_perf_api_dx12/dx12_gpa_session.cc @@ -32,6 +32,7 @@ Dx12GpaSession::~Dx12GpaSession() if (nullptr != amd_ext_gpa_interface_) { amd_ext_gpa_interface_->Release(); + amd_ext_gpa_interface_ = nullptr; } } diff --git a/source/gpu_perf_api_gl/CMakeLists.txt b/source/gpu_perf_api_gl/CMakeLists.txt index 87961020..2b23acbe 100644 --- a/source/gpu_perf_api_gl/CMakeLists.txt +++ b/source/gpu_perf_api_gl/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/gpu_perf_api_gl/asic_info.cc b/source/gpu_perf_api_gl/asic_info.cc index 3a920a71..738ff678 100644 --- a/source/gpu_perf_api_gl/asic_info.cc +++ b/source/gpu_perf_api_gl/asic_info.cc @@ -108,7 +108,7 @@ namespace ogl_utils AsicIdInfo GetAsicInfoForAsicRevision(AsicRevision asic_revision) { - static_assert(kAsicRevisionLast == 0x39, "AsicRevision has changed, add necessary entry for asic info."); + static_assert(kAsicRevisionLast == 0x3B, "AsicRevision has changed, add necessary entry for asic info."); AsicIdInfo asic_id_info = {}; @@ -372,7 +372,21 @@ namespace ogl_utils asic_id_info.is_apu = true; break; - default: + case kGfx1103HP1: + asic_id_info.asic_generation = kAsicGfx11; + asic_id_info.gdt_asic_type = GDT_GFX11_0_3; + asic_id_info.default_device_id = 0x1900; + asic_id_info.is_apu = true; + break; + + case kGfx1103HP2: + asic_id_info.asic_generation = kAsicGfx11; + asic_id_info.gdt_asic_type = GDT_GFX11_0_3B; + asic_id_info.default_device_id = 0x1901; + asic_id_info.is_apu = true; + break; + + default: assert(!"Unhandled AsicRevision type"); asic_id_info.asic_generation = kAsicUnknown; asic_id_info.gdt_asic_type = GDT_ASIC_TYPE_NONE; diff --git a/source/gpu_perf_api_gl/asic_info.h b/source/gpu_perf_api_gl/asic_info.h index 04199305..d390e687 100644 --- a/source/gpu_perf_api_gl/asic_info.h +++ b/source/gpu_perf_api_gl/asic_info.h @@ -146,7 +146,9 @@ namespace ogl_utils kGfx1035 = 0x2F, kGfx1103 = 0x35, kGfx1103B = 0x38, - kAsicRevisionLast + kGfx1103HP1 = 0x39, + kGfx1103HP2 = 0x3A, + kAsicRevisionLast } AsicRevision; /// @brief ASIC Id specific information diff --git a/source/gpu_perf_api_gl/gl_gpa_pass.cc b/source/gpu_perf_api_gl/gl_gpa_pass.cc index 14644d14..8b383436 100644 --- a/source/gpu_perf_api_gl/gl_gpa_pass.cc +++ b/source/gpu_perf_api_gl/gl_gpa_pass.cc @@ -39,22 +39,22 @@ GlGpaPass::GlGpaPass(IGpaSession* gpa_session, PassIndex pass_index, GpaCounterS unsigned int group_index = counter->group_index; - GLint num_counters_in_group = 0; + GLint last_counter_in_group = 0; GLuint group_instance = 0; if (group_index < static_cast(hardware_counters->internal_counter_groups_.size())) { - num_counters_in_group = static_cast(hardware_counters->internal_counter_groups_.at(group_index).num_counters); + last_counter_in_group = static_cast(hardware_counters->internal_counter_groups_.at(group_index).num_counters); group_instance = static_cast(hardware_counters->internal_counter_groups_.at(group_index).block_instance); } else { - num_counters_in_group = static_cast(hardware_counters->additional_groups_[group_index - hardware_counters->counter_groups_array_.size()].num_counters); + last_counter_in_group = static_cast(hardware_counters->additional_groups_[group_index - hardware_counters->counter_groups_array_.size()].num_counters); group_instance = static_cast(hardware_counters->additional_groups_[group_index - hardware_counters->counter_groups_array_.size()].block_instance); } - assert(counter->hardware_counters->counter_index_in_group <= static_cast(num_counters_in_group)); - UNREFERENCED_PARAMETER(num_counters_in_group); + assert(counter->hardware_counters->counter_index_in_group <= static_cast(last_counter_in_group)); + UNREFERENCED_PARAMETER(last_counter_in_group); // If the block instance to enable does not exist on this hardware, then disable the counter in this pass. // This will basically just fake the result as returning 0. diff --git a/source/gpu_perf_api_unit_tests/CMakeLists.txt b/source/gpu_perf_api_unit_tests/CMakeLists.txt index 575a6b85..637c3937 100644 --- a/source/gpu_perf_api_unit_tests/CMakeLists.txt +++ b/source/gpu_perf_api_unit_tests/CMakeLists.txt @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") @@ -29,7 +29,7 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/api_error_tests.cc ${CMAKE_CURRENT_SOURCE_DIR}/gpu_perf_api_loader_tests.cc ${CMAKE_CURRENT_SOURCE_DIR}/gpu_perf_api_unit_tests.cc ${CMAKE_CURRENT_SOURCE_DIR}/counter_generator_tests.cc - ${GPA_SRC_COUNTER_GENERATOR}/gpa_derived_counter_evaluator.inc + ${GPA_SRC_COUNTER_GENERATOR}/gpa_derived_counter_evaluator.hpp ${ADDITIONAL_UNIT_TEST_SOURCES}) @@ -63,8 +63,7 @@ set(INTERNAL_COUNTERS_SRC ${UNITTEST_COUNTER_DIR}/get_internal_derived_counters.cc) set(HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/counter_generator_tests.h - ${CMAKE_CURRENT_SOURCE_DIR}/counters/gpa_counter_desc.h -) + ${CMAKE_CURRENT_SOURCE_DIR}/counters/gpa_counter_desc.h) foreach(API GL DX11 DX12 VK CL) if(NOT WIN32 AND (${API} STREQUAL "DX11" OR ${API} STREQUAL DX12)) diff --git a/source/gpu_perf_api_unit_tests/api_error_tests.cc b/source/gpu_perf_api_unit_tests/api_error_tests.cc index 0e2aba63..b316a85a 100644 --- a/source/gpu_perf_api_unit_tests/api_error_tests.cc +++ b/source/gpu_perf_api_unit_tests/api_error_tests.cc @@ -85,7 +85,7 @@ void GpaApiErrorTest::SetUp() ASSERT_NE(0u, api_name_map.count(api_)) << "API name out of range."; const char* api_name = api_name_map.find(api_)->second; - EXPECT_EQ(kGpaStatusOk, GpaApiManager::Instance()->LoadApi(api_)) << "GPAApiManager failed to load API: " << api_name; + EXPECT_EQ(kGpaStatusOk, GpaApiManager::Instance()->LoadApi(api_)) << "GpaApiManager failed to load API: " << api_name; gpa_function_table_ = GpaApiManager::Instance()->GetFunctionTable(GetParam()); ASSERT_NE(nullptr, gpa_function_table_); diff --git a/source/gpu_perf_api_unit_tests/counter_generator_cl_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_cl_tests.cc index 4aad71a0..a123798b 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_cl_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_cl_tests.cc @@ -140,49 +140,59 @@ static std::vector GetExpectedPublicCounters(GpaHwGeneration gen TEST(CounterDllTests, OpenClUnsupportedHardwareGenerations) { - VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationNone, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationNvidia, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationIntel, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationGfx6, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationGfx7, FALSE); + VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationNone); + VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationNvidia); + VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationIntel); + VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationGfx6); + VerifyHardwareNotSupported(kGpaApiOpencl, kGpaHwGenerationGfx7); +} + +TEST(CounterDllTests, OpenClVerifyInvalidOpenContextParameters) +{ + VerifyInvalidOpenContextParameters(kGpaApiOpencl, kDevIdGfx11); } // Test the OpenCL derived counter blocks TEST(CounterDllTests, OpenClDerivedCounterBlocks) { - VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx8, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); - VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx9, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); - VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx10, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); - VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx103, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); - VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx11, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); + VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx8, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); + VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx9, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); + VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx10, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); + VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx103, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); + VerifyDerivedCounterCount(kGpaApiOpencl, kGpaHwGenerationGfx11, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); } -// Test the openCL counter names on all supported hardware +// Test the openCL counter names on all supported hardware. TEST(CounterDllTests, OpenClCounterNamesByDeviceId) { - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnknown, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdSI, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdCI, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdCIHawaii, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdMi250X, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdMi210, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnsupported1, FALSE); - VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnsupported2, FALSE); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnknown); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdSI); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdCI); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdCIHawaii); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdMi250X); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdMi210); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnsupported1); + VerifyHardwareNotSupported(kGpaApiOpencl, kDevIdUnsupported2); std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdVI, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx8, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx9, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx9, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx10, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx10, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx10_3, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx10_3, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11, FALSE, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11_0_3, FALSE, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11_0_3B, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11, derived_counter_names, hardware_counter_names); + + // The variant hardware can only have the derived counter names verified. + // GetExpectedCountersForGeneration() method in our tests is not thorough enough to create + // the expected list of hardware counters for each variant. + std::vector empty_list_to_skip_tests; + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11_0_3, derived_counter_names, empty_list_to_skip_tests); + VerifyCounterNames(kGpaApiOpencl, kDevIdGfx11_0_3B, derived_counter_names, empty_list_to_skip_tests); } // Test the openCL counter names on each generation @@ -191,7 +201,7 @@ TEST(CounterDllTests, OpenClCounterNamesGfx8) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx8, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenClCounterNamesGfx9) @@ -199,7 +209,7 @@ TEST(CounterDllTests, OpenClCounterNamesGfx9) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx9, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenClCounterNamesGfx10) @@ -207,7 +217,7 @@ TEST(CounterDllTests, OpenClCounterNamesGfx10) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx10, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenClCounterNamesGfx103) @@ -215,7 +225,7 @@ TEST(CounterDllTests, OpenClCounterNamesGfx103) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx103, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenClCounterNamesGfx11) @@ -223,7 +233,7 @@ TEST(CounterDllTests, OpenClCounterNamesGfx11) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx11, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpencl, kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, ClOpenCounterContext) @@ -237,37 +247,37 @@ TEST(CounterDllTests, ClOpenCounterContext) TEST(CounterDllTests, ClCounterLibTestGfx8) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdVI, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdVI, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx9) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx9, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx9, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx10) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx10, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx10, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx103) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx10_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx10_3, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx11) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx1103) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11_0_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11_0_3, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterLibTestGfx1103B) { - VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpencl, kDevIdGfx11_0_3B, REVISION_ID_ANY); } TEST(CounterDllTests, ClCounterFormulaTest) diff --git a/source/gpu_perf_api_unit_tests/counter_generator_dx11_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_dx11_tests.cc index 186e909d..9ee0c3f5 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_dx11_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_dx11_tests.cc @@ -138,65 +138,75 @@ static std::vector GetExpectedPublicCounters(GpaHwGeneration gen TEST(CounterDllTests, Dx11UnsupportedHardwareGenerations) { - VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationNone, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationNvidia, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationIntel, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationGfx6, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationGfx7, FALSE); + VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationNone); + VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationNvidia); + VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationIntel); + VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationGfx6); + VerifyHardwareNotSupported(kGpaApiDirectx11, kGpaHwGenerationGfx7); +} + +TEST(CounterDllTests, Dx11VerifyInvalidOpenContextParameters) +{ + VerifyInvalidOpenContextParameters(kGpaApiDirectx11, kDevIdGfx11); } // Test the Dx11 derived counter blocks TEST(CounterDllTests, Dx11DerivedCounterBlocksGfx8) { - VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx8, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); + VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx8, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); } TEST(CounterDllTests, Dx11DerivedCounterBlocksGfx9) { - VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx9, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); + VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx9, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); } TEST(CounterDllTests, Dx11DerivedCounterBlocksGfx10) { - VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx10, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); + VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx10, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); } TEST(CounterDllTests, Dx11DerivedCounterBlocksGfx103) { - VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx103, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); + VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx103, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); } TEST(CounterDllTests, Dx11DerivedCounterBlocksGfx11) { - VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx11, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); + VerifyDerivedCounterCount(kGpaApiDirectx11, kGpaHwGenerationGfx11, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); } // Test the Dx11 counter names on all supported hardware TEST(CounterDllTests, Dx11CounterNamesByDeviceId) { - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnknown, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdSI, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdCI, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdCIHawaii, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdMi250X, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdMi210, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnsupported1, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnsupported2, FALSE); - - std::vector counter_names; + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnknown); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdSI); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdCI); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdCIHawaii); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdMi250X); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdMi210); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnsupported1); + VerifyHardwareNotSupported(kGpaApiDirectx11, kDevIdUnsupported2); + + std::vector derived_counter_names; std::vector hardware_counter_names; - GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdVI, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx9, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx10, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx10_3, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11_0_3, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11_0_3B, FALSE, counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kDevIdVI, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx9, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx10, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx10_3, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11, derived_counter_names, hardware_counter_names); + + // The variant hardware can only have the derived counter names verified. + // GetExpectedCountersForGeneration() method in our tests is not thorough enough to create + // the expected list of hardware counters for each variant. + std::vector empty_list_to_skip_tests; + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11_0_3, derived_counter_names, empty_list_to_skip_tests); + VerifyCounterNames(kGpaApiDirectx11, kDevIdGfx11_0_3B, derived_counter_names, empty_list_to_skip_tests); } TEST(CounterDllTests, Dx11CounterNamesGfx8) @@ -204,7 +214,7 @@ TEST(CounterDllTests, Dx11CounterNamesGfx8) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx11CounterNamesGfx9) @@ -212,7 +222,7 @@ TEST(CounterDllTests, Dx11CounterNamesGfx9) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx11CounterNamesGfx10) @@ -220,7 +230,7 @@ TEST(CounterDllTests, Dx11CounterNamesGfx10) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx11CounterNamesGfx103) @@ -228,7 +238,7 @@ TEST(CounterDllTests, Dx11CounterNamesGfx103) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx11CounterNamesGfx11) @@ -236,7 +246,7 @@ TEST(CounterDllTests, Dx11CounterNamesGfx11) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } // Test the Dx11 counter names on all generations @@ -245,15 +255,15 @@ TEST(CounterDllTests, Dx11CounterNamesByGeneration) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx11, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx11OpenCounterContext) @@ -267,44 +277,44 @@ TEST(CounterDllTests, Dx11OpenCounterContext) TEST(CounterDllTests, Dx11CounterLibTestGfx8) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdVI, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdVI, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdVI, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdVI, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx9) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx9, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx9, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx9, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx9, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx10) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx10, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx10, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx10, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx10, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx103) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx10_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx10_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx10_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx10_3, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx11) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx1103) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11_0_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11_0_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11_0_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11_0_3, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterLibTestGfx1103B) { - VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx11, kDevIdGfx11_0_3B, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx11, kDevIdGfx11_0_3B, REVISION_ID_ANY); } TEST(CounterDllTests, Dx11CounterFormulaTest) diff --git a/source/gpu_perf_api_unit_tests/counter_generator_dx12_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_dx12_tests.cc index 58ba217a..4c6ef7cf 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_dx12_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_dx12_tests.cc @@ -138,65 +138,75 @@ static std::vector GetExpectedPublicCounters(GpaHwGeneration gen TEST(CounterDllTests, Dx12UnsupportedHardwareGenerations) { - VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationNone, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationNvidia, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationIntel, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationGfx6, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationGfx7, FALSE); + VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationNone); + VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationNvidia); + VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationIntel); + VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationGfx6); + VerifyHardwareNotSupported(kGpaApiDirectx12, kGpaHwGenerationGfx7); +} + +TEST(CounterDllTests, Dx12VerifyInvalidOpenContextParameters) +{ + VerifyInvalidOpenContextParameters(kGpaApiDirectx12, kDevIdGfx11); } // Test the Dx12 derived counter blocks TEST(CounterDllTests, Dx12DerivedCounterBlocksGfx8) { - VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx8, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); + VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx8, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); } TEST(CounterDllTests, Dx12DerivedCounterBlocksGfx9) { - VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx9, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); + VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx9, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); } TEST(CounterDllTests, Dx12DerivedCounterBlocksGfx10) { - VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx10, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); + VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx10, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); } TEST(CounterDllTests, Dx12DerivedCounterBlocksGfx103) { - VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx103, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); + VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx103, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); } TEST(CounterDllTests, Dx12DerivedCounterBlocksGfx11) { - VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx11, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); + VerifyDerivedCounterCount(kGpaApiDirectx12, kGpaHwGenerationGfx11, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); } // Test the Dx12 counter names on all supported hardware TEST(CounterDllTests, Dx12CounterNamesByDeviceId) { - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnknown, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdSI, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdCI, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdCIHawaii, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdMi250X, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdMi210, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnsupported1, FALSE); - VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnsupported2, FALSE); - - std::vector counter_name; + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnknown); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdSI); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdCI); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdCIHawaii); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdMi250X); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdMi210); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnsupported1); + VerifyHardwareNotSupported(kGpaApiDirectx12, kDevIdUnsupported2); + + std::vector derived_counter_names; std::vector hardware_counter_names; - GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdVI, FALSE, counter_name, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx9, FALSE, counter_name, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx10, FALSE, counter_name, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx10_3, FALSE, counter_name, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11, FALSE, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11_0_3, FALSE, counter_name, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11_0_3B, FALSE, counter_name, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kDevIdVI, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx9, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx10, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx10_3, derived_counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11, derived_counter_names, hardware_counter_names); + + // The variant hardware can only have the derived counter names verified. + // GetExpectedCountersForGeneration() method in our tests is not thorough enough to create + // the expected list of hardware counters for each variant. + std::vector empty_list_to_skip_tests; + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11_0_3, derived_counter_names, empty_list_to_skip_tests); + VerifyCounterNames(kGpaApiDirectx12, kDevIdGfx11_0_3B, derived_counter_names, empty_list_to_skip_tests); } TEST(CounterDllTests, Dx12CounterNamesGfx8) @@ -204,7 +214,7 @@ TEST(CounterDllTests, Dx12CounterNamesGfx8) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx12CounterNamesGfx9) @@ -212,7 +222,7 @@ TEST(CounterDllTests, Dx12CounterNamesGfx9) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx12CounterNamesGfx10) @@ -220,7 +230,7 @@ TEST(CounterDllTests, Dx12CounterNamesGfx10) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx12CounterNamesGfx103) @@ -228,7 +238,7 @@ TEST(CounterDllTests, Dx12CounterNamesGfx103) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx12CounterNamesGfx11) @@ -236,7 +246,7 @@ TEST(CounterDllTests, Dx12CounterNamesGfx11) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } // Test the Dx12 counter names on all generations @@ -245,15 +255,15 @@ TEST(CounterDllTests, Dx12CounterNamesByGeneration) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiDirectx12, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } TEST(CounterDllTests, Dx12OpenCounterContext) @@ -267,44 +277,44 @@ TEST(CounterDllTests, Dx12OpenCounterContext) TEST(CounterDllTests, Dx12CounterLibTestGfx8) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdVI, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdVI, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdVI, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdVI, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx9) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx9, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx9, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx9, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx9, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx10) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx10, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx10, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx10, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx10, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx103) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx10_3, REVISION_ID_ANY, true); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx10_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx10_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx10_3, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx11) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11, REVISION_ID_ANY, true); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx1103) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11_0_3, REVISION_ID_ANY, true); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11_0_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11_0_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11_0_3, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterLibTestGfx1103B) { - VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11_0_3B, REVISION_ID_ANY, true); - VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiDirectx12, kDevIdGfx11_0_3B, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiDirectx12, kDevIdGfx11_0_3B, REVISION_ID_ANY); } TEST(CounterDllTests, Dx12CounterFormulaTest) diff --git a/source/gpu_perf_api_unit_tests/counter_generator_gl_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_gl_tests.cc index 60386bc9..a6903847 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_gl_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_gl_tests.cc @@ -137,72 +137,62 @@ static std::vector GetExpectedPublicCounters(GpaHwGeneration gen TEST(CounterDllTests, OpenGlUnsupportedHardwareGeneration) { - VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationNone, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationNvidia, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationIntel, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationGfx6, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationGfx7, FALSE); + VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationNone); + VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationNvidia); + VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationIntel); + VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationGfx6); + VerifyHardwareNotSupported(kGpaApiOpengl, kGpaHwGenerationGfx7); +} + +TEST(CounterDllTests, OpenGlVerifyInvalidOpenContextParameters) +{ + VerifyInvalidOpenContextParameters(kGpaApiOpengl, kDevIdGfx11); } #ifdef _WIN32 // Test the OpenGl derived counter blocks TEST(CounterDllTests, OpenGlDerivedCounterBlocksGfx8) { - VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx8, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); + VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx8, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); } TEST(CounterDllTests, OpenGlDerivedCounterBlocksGfx9) { - VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx9, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); + VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx9, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); } TEST(CounterDllTests, OpenGlDerivedCounterBlocksGfx10) { - VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx10, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); + VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx10, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); } TEST(CounterDllTests, OpenGlDerivedCounterBlocksGfx103) { - VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx103, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); + VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx103, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); } TEST(CounterDllTests, OpenGlDerivedCounterBlocksGfx11) { - VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx11, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); + VerifyDerivedCounterCount(kGpaApiOpengl, kGpaHwGenerationGfx11, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); } #endif -// Test the OpenGl counter names on all supported hardware by DeviceID back-to-back. -TEST(CounterDllTests, OpenGlCounterNamesByDeviceId) +TEST(CounterDllTests, OpenGlUnsupportedDeviceId) { - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnknown, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdSI, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdCI, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdCIHawaii, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdMi250X, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdMi210, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnsupported1, FALSE); - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnsupported2, FALSE); - - std::vector counter_names; - std::vector hardware_counter_names; - GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdVI, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx9, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10_3, FALSE, counter_names, hardware_counter_names); - GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3B, FALSE, counter_names, hardware_counter_names); + // Verify that any unsupported Device IDs properly report that the hardware is not supported. + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnknown); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdSI); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdCI); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdCIHawaii); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdMi250X); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdMi210); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnsupported1); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnsupported2); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdUnknown) { - VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnknown, FALSE); + VerifyHardwareNotSupported(kGpaApiOpengl, kDevIdUnknown); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx8) @@ -210,7 +200,7 @@ TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx8) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdVI, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kDevIdVI, counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx9) @@ -218,7 +208,7 @@ TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx9) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx9, counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx10) @@ -226,7 +216,7 @@ TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx10) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10, counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx103) @@ -234,17 +224,22 @@ TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx103) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10_3, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx10_3, counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesDeviceIdGfx11) { - std::vector counter_names; + std::vector derived_counter_names; std::vector hardware_counter_names; - GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3, FALSE, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3B, FALSE, counter_names, hardware_counter_names); + GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11, derived_counter_names, hardware_counter_names); + + // The variant hardware can only have the derived counter names verified. + // GetExpectedCountersForGeneration() method in our tests is not thorough enough to create + // the expected list of hardware counters for each variant. + std::vector empty_list_to_skip_tests; + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3, derived_counter_names, empty_list_to_skip_tests); + VerifyCounterNames(kGpaApiOpengl, kDevIdGfx11_0_3B, derived_counter_names, empty_list_to_skip_tests); } TEST(CounterDllTests, OpenGlCounterNamesGfx8) @@ -252,7 +247,7 @@ TEST(CounterDllTests, OpenGlCounterNamesGfx8) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx8, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesGfx9) @@ -260,7 +255,7 @@ TEST(CounterDllTests, OpenGlCounterNamesGfx9) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx9, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesGfx10) @@ -268,7 +263,7 @@ TEST(CounterDllTests, OpenGlCounterNamesGfx10) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx10, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesGfx103) @@ -276,7 +271,7 @@ TEST(CounterDllTests, OpenGlCounterNamesGfx103) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx103, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlCounterNamesGfx11) @@ -284,7 +279,7 @@ TEST(CounterDllTests, OpenGlCounterNamesGfx11) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx11, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); } // Test the OpenGl counter names on all generations back-to-back. @@ -293,15 +288,15 @@ TEST(CounterDllTests, OpenGlCounterNamesByGeneration) std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx8, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx9, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx10, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx103, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx11, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiOpengl, kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); } TEST(CounterDllTests, OpenGlOpenCounterContext) @@ -316,44 +311,44 @@ TEST(CounterDllTests, OpenGlOpenCounterContext) #ifdef _WIN32 TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx8) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdVI, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdVI, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdVI, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdVI, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx9) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx9, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx9, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx9, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx9, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx10) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx10, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx10, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx10, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx10, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx103) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx10_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx10_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx10_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx10_3, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx11) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx1103) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11_0_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11_0_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11_0_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11_0_3, REVISION_ID_ANY); } TEST(CounterDllTests, GlCounterLibTestDeviceIdGfx1103B) { - VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiOpengl, kDevIdGfx11_0_3B, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiOpengl, kDevIdGfx11_0_3B, REVISION_ID_ANY); } #endif diff --git a/source/gpu_perf_api_unit_tests/counter_generator_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_tests.cc index 7c370744..18da838a 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_tests.cc @@ -13,7 +13,7 @@ #include "gpu_performance_api/gpu_perf_api_types.h" #include "gpu_perf_api_common/gpa_hw_info.h" - +#include "gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.hpp" #include "gpu_perf_api_counter_generator/gpa_split_counters_interfaces.h" #ifdef _WIN32 @@ -22,36 +22,51 @@ const char* kCountersLibName = "GPUPerfAPICounters" AMDT_PLATFORM_SUFFIX AMDT_DE const char* kCountersLibName = "libGPUPerfAPICounters" AMDT_PLATFORM_SUFFIX AMDT_DEBUG_SUFFIX AMDT_BUILD_SUFFIX ".so"; #endif -#define LOAD_AND_VERIFY_COUNTER_LIB(lib_handle, fn_table) \ - *lib_handle = LoadLib(kCountersLibName); \ - ASSERT_NE((LibHandle) nullptr, *lib_handle); \ - \ - GpaCounterLibGetFuncTablePtrType get_func_table_ptr = \ - reinterpret_cast(GetEntryPoint(*lib_handle, "GpaCounterLibGetFuncTable")); \ - ASSERT_NE((GpaCounterLibGetFuncTablePtrType) nullptr, get_func_table_ptr); \ - \ - GpaStatus gpa_status = get_func_table_ptr(fn_table); \ - EXPECT_EQ(kGpaStatusOk, gpa_status) - LibHandle LoadLib(const char* lib_name) { LibHandle lib_handle = nullptr; + if (lib_name != NULL && strlen(lib_name) > 0) + { #ifdef _WIN32 - // raise an error if the library is already loaded - lib_handle = GetModuleHandleA(lib_name); - EXPECT_TRUE(lib_handle == nullptr); - lib_handle = LoadLibraryA(lib_name); + // raise an error if the library is already loaded + lib_handle = GetModuleHandleA(lib_name); + EXPECT_TRUE(lib_handle == nullptr); + lib_handle = LoadLibraryA(lib_name); #else - // raise an error if the library is already loaded - lib_handle = dlopen(lib_name, RTLD_NOLOAD); - EXPECT_TRUE(lib_handle == nullptr); - lib_handle = dlopen(lib_name, RTLD_NOW); + // raise an error if the library is already loaded + lib_handle = dlopen(lib_name, RTLD_NOLOAD); + EXPECT_TRUE(lib_handle == nullptr); + lib_handle = dlopen(lib_name, RTLD_NOW); #endif + } EXPECT_TRUE(lib_handle != nullptr); return lib_handle; } -// Give a meaningful names to event IDs being used in several tests. +bool LoadAndVerifyCounterLib(LibHandle* lib_handle, void* fn_table) +{ + GpaStatus gpa_status = kGpaStatusErrorLibLoadFailed; + + *lib_handle = LoadLib(kCountersLibName); + EXPECT_NE((LibHandle) nullptr, *lib_handle); + + if (*lib_handle != nullptr) + { + GpaCounterLibGetFuncTablePtrType get_func_table_ptr = + reinterpret_cast(GetEntryPoint(*lib_handle, "GpaCounterLibGetFuncTable")); + EXPECT_NE((GpaCounterLibGetFuncTablePtrType) nullptr, get_func_table_ptr); + + if (get_func_table_ptr != nullptr) + { + gpa_status = get_func_table_ptr(fn_table); + EXPECT_EQ(kGpaStatusOk, gpa_status); + } + } + + return kGpaStatusOk == gpa_status; +} + +// Give meaningful names to event IDs being used in several tests. const GpaUInt32 kSqPerfSelWaves = 4; const GpaUInt32 kGl1cPerfSelReq = 14; const GpaUInt32 kGl2cPerfSelMiss = 43; @@ -91,10 +106,7 @@ void* GetEntryPoint(LibHandle lib_handle, const char* entry_point_name) return proc_address; } -void VerifyDerivedCounterCount(const GpaApiType api, - GpaHwGeneration generation, - const GpaUInt8 generate_asic_specific_counters, - const std::vector counter_descriptions) +void VerifyDerivedCounterCount(const GpaApiType api, GpaHwGeneration generation, const std::vector counter_descriptions) { LibHandle lib_handle = nullptr; const GpaCounterInfo* counter_info = nullptr; @@ -104,11 +116,12 @@ void VerifyDerivedCounterCount(const GpaApiType api, GpaUInt32 counter_index = 0; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, generation_device_map[generation], REVISION_ID_ANY, nullptr, 0}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &fn_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &fn_table)) + { + return; + } - EXPECT_EQ(kGpaStatusOk, - fn_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, kGpaOpenContextDefaultBit, generate_asic_specific_counters, &counter_context)); + EXPECT_EQ(kGpaStatusOk, fn_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, kGpaOpenContextDefaultBit, TRUE, &counter_context)); if (counter_context != nullptr) { @@ -135,20 +148,23 @@ void VerifyDerivedCounterCount(const GpaApiType api, UnloadLib(lib_handle); } -void VerifyNotImplemented(GpaApiType api, unsigned int device_Id, GpaUInt8 generate_asic_specific_counters) +void VerifyNotImplemented(GpaApiType api, unsigned int device_Id) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_Id, REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusErrorHardwareNotSupported, gpa_status); gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); @@ -157,20 +173,23 @@ void VerifyNotImplemented(GpaApiType api, unsigned int device_Id, GpaUInt8 gener UnloadLib(lib_handle); } -void VerifyNotImplemented(GpaApiType api, GpaHwGeneration generation, GpaUInt8 generate_asic_specific_counters) +void VerifyNotImplemented(GpaApiType api, GpaHwGeneration generation) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, generation_device_map[generation], REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusErrorHardwareNotSupported, gpa_status); gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); @@ -179,20 +198,23 @@ void VerifyNotImplemented(GpaApiType api, GpaHwGeneration generation, GpaUInt8 g UnloadLib(lib_handle); } -void VerifyHardwareNotSupported(GpaApiType api, unsigned int device_id, GpaUInt8 generate_asic_specific_counters) +void VerifyHardwareNotSupported(GpaApiType api, unsigned int device_id) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusErrorHardwareNotSupported, gpa_status); gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); @@ -201,20 +223,23 @@ void VerifyHardwareNotSupported(GpaApiType api, unsigned int device_id, GpaUInt8 UnloadLib(lib_handle); } -void VerifyHardwareNotSupported(GpaApiType api, GpaHwGeneration generation, GpaUInt8 generate_asic_specific_counters) +void VerifyHardwareNotSupported(GpaApiType api, GpaHwGeneration generation) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, generation_device_map[generation], REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusErrorHardwareNotSupported, gpa_status); gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); @@ -223,20 +248,74 @@ void VerifyHardwareNotSupported(GpaApiType api, GpaHwGeneration generation, GpaU UnloadLib(lib_handle); } +void VerifyInvalidOpenContextParameters(GpaApiType api, unsigned int device_id) +{ + LibHandle lib_handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } + + // GPA always generates ASIC-specific counters now, and so passing in FALSE for this parameter is now an invalid parameter. + GpaUInt8 generate_asic_specific_counters_deprecated = FALSE; + GpaCounterContext gpa_counter_context = nullptr; + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + generate_asic_specific_counters_deprecated, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusErrorInvalidParameter, gpa_status); + EXPECT_EQ(nullptr, gpa_counter_context); + if (gpa_status == kGpaStatusOk) + { + EXPECT_NE(nullptr, gpa_counter_context); + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusErrorNullPointer, gpa_status); + } + + // It is also an InvalidParameter error to hide the derived counters without exposing the hardware counters, + // because that would result in 0 counters being exposed. + gpa_counter_context = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextHideDerivedCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusErrorInvalidParameter, gpa_status); + EXPECT_EQ(nullptr, gpa_counter_context); + if (gpa_status == kGpaStatusOk) + { + EXPECT_NE(nullptr, gpa_counter_context); + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusErrorNullPointer, gpa_status); + } + + UnloadLib(lib_handle); +} + void VerifyCounterNames(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, std::vector expected_derived_names, std::vector expected_hardware_names) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } std::vector&>> counter_combinations; counter_combinations.push_back({kGpaOpenContextDefaultBit, expected_derived_names}); - counter_combinations.push_back({kGpaOpenContextHideDerivedCountersBit | kGpaOpenContextEnableHardwareCountersBit, expected_hardware_names}); + + if (!expected_hardware_names.empty()) + { + counter_combinations.push_back({kGpaOpenContextHideDerivedCountersBit | kGpaOpenContextEnableHardwareCountersBit, expected_hardware_names}); + } for (auto counter_combination = counter_combinations.begin(); counter_combination != counter_combinations.end(); ++counter_combination) { @@ -245,11 +324,11 @@ void VerifyCounterNames(GpaApiType api, GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - open_context_flags, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + open_context_flags, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); GpaUInt32 num_counters = 0u; @@ -298,15 +377,16 @@ void VerifyCounterNames(GpaApiType api, UnloadLib(lib_handle); } -// Verifies that GpaCounterLibOpenCounterContext() succeeds with all values of -// GpaOpenContextBits, as well as with or without generate_asic_specific_counters -// +// Verifies that GpaCounterLibOpenCounterContext() succeeds with all values of GpaOpenContextBits. void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, generation_device_map[generation], REVISION_ID_ANY, nullptr, 0}; @@ -329,17 +409,12 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) // Make sure the options work that are expected to pass. for (GpaOpenContextBits context_bits : context_bits_values) { - gpa_status; - for (GpaUInt8 generate_asic_specific_counters = 0; generate_asic_specific_counters < 2; generate_asic_specific_counters++) - { - GpaCounterContext gpa_counter_context = nullptr; - EXPECT_EQ(kGpaStatusOk, - gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, context_bits, generate_asic_specific_counters, &gpa_counter_context)); - EXPECT_NE(gpa_counter_context, nullptr); + GpaCounterContext gpa_counter_context = nullptr; + EXPECT_EQ(kGpaStatusOk, + gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, context_bits, TRUE, &gpa_counter_context)); + EXPECT_NE(gpa_counter_context, nullptr); - EXPECT_EQ(kGpaStatusOk, gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context)); - } + EXPECT_EQ(kGpaStatusOk, gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context)); } // Can't open a context with hidden derived counters, because that would result no counters being exposed - don't set the user up for a faulty situation. @@ -348,7 +423,7 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) EXPECT_NE(kGpaStatusOk, gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, (GpaOpenContextBits)kGpaOpenContextHideDerivedCountersBit, FALSE, &gpa_counter_context)); + api, counter_context_hardware_info, (GpaOpenContextBits)kGpaOpenContextHideDerivedCountersBit, TRUE, &gpa_counter_context)); EXPECT_EQ(gpa_counter_context, nullptr); // Only close the context if it was actually created, but it should have failed to open. @@ -381,9 +456,9 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) { GpaCounterContext gpa_counter_context = nullptr; - EXPECT_EQ(kGpaStatusOk, - gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, clockmode_context_bits, FALSE, &gpa_counter_context)); + EXPECT_EQ( + kGpaStatusOk, + gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, clockmode_context_bits, TRUE, &gpa_counter_context)); EXPECT_NE(gpa_counter_context, nullptr); // Only close the context if it was actually created. @@ -404,7 +479,7 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) GpaCounterContext gpa_counter_context = nullptr; EXPECT_EQ(kGpaStatusOk, gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, kGpaOpenContextDefaultBit, FALSE, &gpa_counter_context)); + api, counter_context_hardware_info, kGpaOpenContextDefaultBit, TRUE, &gpa_counter_context)); EXPECT_NE(gpa_counter_context, nullptr); if (gpa_counter_context != nullptr) @@ -423,7 +498,7 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, kGpaOpenContextHidePublicCountersBit | kGpaOpenContextEnableHardwareCountersBit, - FALSE, + TRUE, &gpa_counter_context)); EXPECT_NE(gpa_counter_context, nullptr); @@ -441,7 +516,7 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) EXPECT_EQ( kGpaStatusOk, gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, FALSE, &gpa_counter_context)); + api, counter_context_hardware_info, kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, TRUE, &gpa_counter_context)); EXPECT_NE(gpa_counter_context, nullptr); if (gpa_counter_context != nullptr) @@ -462,28 +537,23 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation) UnloadLib(lib_handle); } -void VerifyCounterNames(GpaApiType api, - GpaHwGeneration generation, - GpaUInt8 generate_asic_specific_counters, - std::vector expectedNames, - std::vector expected_hardware_names) +void VerifyCounterNames(GpaApiType api, GpaHwGeneration generation, std::vector expectedNames, std::vector expected_hardware_names) { assert(generation_device_map.size() == GDT_HW_GENERATION_LAST); - VerifyCounterNames(api, generation_device_map[generation], generate_asic_specific_counters, expectedNames, expected_hardware_names); + VerifyCounterNames(api, generation_device_map[generation], expectedNames, expected_hardware_names); } -void VerifyCounterLibInterface(GpaApiType api, - unsigned device_id, - unsigned revision_id, - GpaUInt8 asic_specific, - std::vector expected_derived_counter_list) +void VerifyCounterLibInterface(GpaApiType api, unsigned device_id, unsigned revision_id, std::vector expected_derived_counter_list) { UNREFERENCED_PARAMETER(expected_derived_counter_list); LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; @@ -491,11 +561,12 @@ void VerifyCounterLibInterface(GpaApiType api, if (device_id == kDevIdGfx10_3) { GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, revision_id, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, - asic_specific, - &gpa_counter_context); + GpaStatus gpa_status = + gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); GpaCounterParam counter_param; @@ -520,8 +591,8 @@ void VerifyCounterLibInterface(GpaApiType api, } { GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, revision_id, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( - api, counter_context_hardware_info, kGpaOpenContextDefaultBit, asic_specific, &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext( + api, counter_context_hardware_info, kGpaOpenContextDefaultBit, TRUE, &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); const GpaCounterInfo* temp_ptr = nullptr; @@ -621,11 +692,11 @@ void VerifyCounterLibInterface(GpaApiType api, } { GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, revision_id, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, - asic_specific, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); { @@ -863,7 +934,7 @@ void VerifyCounterLibInterface(GpaApiType api, lib_handle = nullptr; } -void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsigned revision_id, GpaUInt8 asic_specific) +void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsigned revision_id) { if (kGpaApiOpencl == api) { @@ -875,7 +946,10 @@ void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsi LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; @@ -884,7 +958,7 @@ void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsi GpaUInt32* derived_counter_list) -> std::map> { std::map> pass_counter_map; GpaUInt32 pass_count; - gpa_status = + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCountersByPass(gpa_counter_context, counter_count, derived_counter_list, &pass_count, nullptr, nullptr); if (kGpaStatusOk == gpa_status) @@ -936,11 +1010,11 @@ void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsi }; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, revision_id, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, - asic_specific, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit | kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); GpaCounterParam counter_param; @@ -989,8 +1063,7 @@ void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsi } else if (device_id == kDevIdVI) { - pass_counter_names = {{0, {"GRBM_PERF_SEL_GUI_ACTIVE", "GRBM_PERF_SEL_COUNT", "SQ_PS0_PERF_SEL_WAVES"}}, - {1, {"GPUTime_BOTTOM_TO_BOTTOM_DURATION"}}}; + pass_counter_names = {{0, {"GRBM_PERF_SEL_GUI_ACTIVE", "GRBM_PERF_SEL_COUNT", "SQ_PS0_PERF_SEL_WAVES"}}, {1, {"GPUTime_BOTTOM_TO_BOTTOM_DURATION"}}}; } else { @@ -1026,24 +1099,23 @@ void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsi lib_handle = nullptr; } -void VerifyPassCount(GpaApiType api, - unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, - const std::vector& counters_to_enable, - unsigned int expected_num_passes) +void VerifyPassCount(GpaApiType api, unsigned int device_id, const std::vector& counters_to_enable, unsigned int expected_num_passes) { LibHandle lib_handle = nullptr; GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; - LOAD_AND_VERIFY_COUNTER_LIB(&lib_handle, &gpa_counter_lib_func_table); + if (!LoadAndVerifyCounterLib(&lib_handle, &gpa_counter_lib_func_table)) + { + return; + } GpaCounterContext gpa_counter_context = nullptr; GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, REVISION_ID_ANY, nullptr, 0}; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, - counter_context_hardware_info, - kGpaOpenContextDefaultBit, - generate_asic_specific_counters, - &gpa_counter_context); + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, + counter_context_hardware_info, + kGpaOpenContextDefaultBit, + TRUE, + &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); GpaUInt32 pass_count = 0u; @@ -1059,7 +1131,6 @@ void VerifyPassCount(GpaApiType api, void VerifyCountersInPass(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, const std::vector& counter_to_enable, const std::vector>& expected_hw_counters_per_pass, const std::map>& expected_result_location) @@ -1068,7 +1139,6 @@ void VerifyCountersInPass(GpaApiType ASSERT_NE((LibHandle) nullptr, lib_handle); UNREFERENCED_PARAMETER(api); UNREFERENCED_PARAMETER(device_id); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(counter_to_enable); UNREFERENCED_PARAMETER(expected_hw_counters_per_pass); UNREFERENCED_PARAMETER(expected_result_location); @@ -1078,7 +1148,6 @@ void VerifyCountersInPass(GpaApiType void VerifyCounterCalculation(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, char* counter_name, const std::vector& sample_results, GpaFloat64 expected_result) @@ -1087,7 +1156,6 @@ void VerifyCounterCalculation(GpaApiType api, ASSERT_NE((LibHandle) nullptr, lib_handle); UNREFERENCED_PARAMETER(api); UNREFERENCED_PARAMETER(device_id); - UNREFERENCED_PARAMETER(generate_asic_specific_counters); UNREFERENCED_PARAMETER(counter_name); UNREFERENCED_PARAMETER(sample_results); UNREFERENCED_PARAMETER(expected_result); @@ -1095,8 +1163,6 @@ void VerifyCounterCalculation(GpaApiType api, UnloadLib(lib_handle); } -#include "gpu_perf_api_counter_generator/gpa_derived_counter_evaluator.inc" - void VerifyCounterFormula(std::vector public_counters) { GpaHwInfo dummy_hardware_info; diff --git a/source/gpu_perf_api_unit_tests/counter_generator_tests.h b/source/gpu_perf_api_unit_tests/counter_generator_tests.h index cd06c224..c4a7fe0c 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_tests.h +++ b/source/gpu_perf_api_unit_tests/counter_generator_tests.h @@ -27,22 +27,27 @@ #include "gpu_perf_api_unit_tests/counters/gpa_counter_desc.h" -static const unsigned int kDevIdUnknown = 0xFFFFFFFF; ///< bogus device id. -static const unsigned int kDevIdSI = 0x6798; ///< 7970 Series. -static const unsigned int kDevIdCI = 0x6649; ///< FirePro W5100. -static const unsigned int kDevIdCIHawaii = 0x67A0; ///< HAWAII XTGL. -static const unsigned int kDevIdVI = 0x6900; ///< R7 M260. -static const unsigned int kDevIdGfx8 = 0x67DF; ///< Gfx8. -static const unsigned int kDevIdGfx9 = 0x6863; ///< Gfx9. -static const unsigned int kDevIdMi250X = 0x740C; ///< GFX9_0_A (MI250X). -static const unsigned int kDevIdMi210 = 0x740F; ///< GFX9_0_A (MI210). -static const unsigned int kDevIdGfx10 = 0x7310; ///< Gfx10. -static const unsigned int kDevIdGfx10_3 = 0x73A0; ///< Gfx10_3. -static const unsigned int kDevIdGfx11 = 0x744C; ///< Gfx11. -static const unsigned int kDevIdGfx11_0_3 = 0x15BF; ///< Gfx11_0_3. -static const unsigned int kDevIdGfx11_0_3B = 0x15C8; ///< Gfx11_0_3B. -static const unsigned int kDevIdUnsupported1 = 0x1506; ///< An unsupported device id. -static const unsigned int kDevIdUnsupported2 = 0x164e; ///< An unsupported device id. +static const unsigned int kDevIdUnknown = 0xFFFFFFFF; ///< bogus device id. +static const unsigned int kDevIdSI = 0x6798; ///< 7970 Series. +static const unsigned int kDevIdCI = 0x6649; ///< FirePro W5100. +static const unsigned int kDevIdCIHawaii = 0x67A0; ///< HAWAII XTGL. +static const unsigned int kDevIdVI = 0x98E4; ///< VI (Gfx8 Stoney). +static const unsigned int kDevIdGfx8 = kDevIdVI; ///< Gfx8 (Stoney). +static const unsigned int kDevIdGfx8Ellesmere = 0x67DF; ///< Gfx8 Ellesmere. +static const unsigned int kDevIdGfx8Tonga = 0x6920; ///< Gfx8 Tonga. +static const unsigned int kDevIdGfx8Iceland = 0x6900; ///< Gfx8 R7 M260 (Iceland). +static const unsigned int kDevIdGfx9 = 0x6863; ///< Gfx9. +static const unsigned int kDevIdMi250X = 0x740C; ///< GFX9_0_A (MI250X). +static const unsigned int kDevIdMi210 = 0x740F; ///< GFX9_0_A (MI210). +static const unsigned int kDevIdGfx10 = 0x7310; ///< Gfx10. +static const unsigned int kDevIdGfx10_3 = 0x73A0; ///< Gfx10_3. +static const unsigned int kDevIdGfx10_3_1 = 0x73DF; ///< Gfx10_3_1. +static const unsigned int kDevIdGfx10_3_4 = 0x743F; ///< Gfx10_3_4. +static const unsigned int kDevIdGfx11 = 0x744C; ///< Gfx11. +static const unsigned int kDevIdGfx11_0_3 = 0x15BF; ///< Gfx11_0_3. +static const unsigned int kDevIdGfx11_0_3B = 0x15C8; ///< Gfx11_0_3B. +static const unsigned int kDevIdUnsupported1 = 0x1506; ///< An unsupported device id. +static const unsigned int kDevIdUnsupported2 = 0x164e; ///< An unsupported device id. /// Name of the counter library. extern const char* kCountersLibName; @@ -59,6 +64,16 @@ LibHandle LoadLib(const char* lib_name); /// @param [in] lib_handle The handle of the library to unload. void UnloadLib(LibHandle lib_handle); +/// @brief Loads the GPUPerfAPICounterLib and populates the function table. +/// +/// Call UnloadLib on the returned LibHandle when done using the library. +/// +/// @param [out] lib_handle The populated library handle. +/// @param [out] fn_table The populated function table. +/// +/// @return True if the counter library could be loaded; false otherwise. +bool LoadAndVerifyCounterLib(LibHandle* lib_handle, void* fn_table); + /// @brief Get an entrypoint within a library. /// /// @param [in] lib_handle The handle of the loaded library. @@ -71,30 +86,28 @@ void* GetEntryPoint(LibHandle lib_handle, const char* entrypoint_name); /// /// @param [in] api The API being used in the test. /// @param [in] generation The hardware generation being used. -/// @param [in] generation_asic_specific_counters Flag indicating whether to use ASIC specific counters, if available. /// @param [in] public_counters Public descriptions of the counter. void VerifyDerivedCounterCount(const GpaApiType api, const GpaHwGeneration generation, - const GpaUInt8 generate_asic_specific_counters, const std::vector counter_descriptions); -void VerifyNotImplemented(GpaApiType api, unsigned int device_id, GpaUInt8 generation_asic_specific_counters); +void VerifyNotImplemented(GpaApiType api, unsigned int device_id); + +void VerifyNotImplemented(GpaApiType api, GpaHwGeneration generation); -void VerifyNotImplemented(GpaApiType api, GpaHwGeneration generation, GpaUInt8 genrate_asic_specific_counters); +void VerifyInvalidOpenContextParameters(GpaApiType api, unsigned int device_id); -void VerifyHardwareNotSupported(GpaApiType api, unsigned int device_id, GpaUInt8 generate_asic_specific_counters); +void VerifyHardwareNotSupported(GpaApiType api, unsigned int device_id); -void VerifyHardwareNotSupported(GpaApiType api, GpaHwGeneration generation, GpaUInt8 generate_asic_specific_counters); +void VerifyHardwareNotSupported(GpaApiType api, GpaHwGeneration generation); void VerifyCounterNames(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, std::vector expected_names, std::vector expected_hardware_names); void VerifyCounterNames(GpaApiType api, GpaHwGeneration generation, - GpaUInt8 generate_asic_specific_counters, std::vector expected_names, std::vector expected_hardware_names); @@ -103,14 +116,12 @@ void VerifyOpenCounterContext(GpaApiType api, GpaHwGeneration generation); void VerifyCounterLibInterface(GpaApiType api, unsigned int device_id, unsigned int revision_id, - GpaUInt8 asic_specific, std::vector expected_derived_counter_list = std::vector()); -void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsigned revision_id, GpaUInt8 asic_specific); +void VerifyCounterByPassCounterLibEntry(GpaApiType api, unsigned device_id, unsigned revision_id); void VerifyPassCount(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, const std::vector& counters_to_enable, unsigned int expected_num_passes); @@ -118,13 +129,11 @@ void VerifyPassCount(GpaApiType api, /// /// @param [in] api The API being used in the test. /// @param [in] device_id The hardware being used. -/// @param [in] generation_asic_specific_counters Flag indicating whether to use ASIC specific counters, if available. /// @param [in] counters_to_enable The list of exposed counters being tested. /// @param [in] expected_hw_counters_per_pass A list of counters in each pass (list of lists). /// @param [in] expected_result_location A list of maps for the result locations. void VerifyCountersInPass(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, const std::vector& counters_to_enable, const std::vector>& expected_hw_counters_per_pass, const std::map>& expected_result_location); @@ -133,13 +142,11 @@ void VerifyCountersInPass(GpaApiType /// /// @param [in] api The API being used in the test /// @param [in] device_id The hardware being used -/// @param [in] generation_asic_specific_counters Flag indicating whether to use ASIC specific counters, if available. /// @param [in] counter_name Name of the counter /// @param [in] sample_results List of sample results /// @param [in] expected_result Expected result void VerifyCounterCalculation(GpaApiType api, unsigned int device_id, - GpaUInt8 generate_asic_specific_counters, char* counter_name, const std::vector& sample_results, GpaFloat64 expected_result); @@ -154,12 +161,10 @@ void VerifyCounterFormula(std::vector public_counters); /// /// @param [in] api The API being used in the test. /// @param [in] device_id The hardware being used. -/// @param [in] generation_asic_specific_counters Flag indicating whether to use ASIC specific counters, if available. /// @param [in] counters_to_enable The list of exposed counters being tested. /// @param [in,out] output_stream Output string stream describing the counters in each pass and the result locations. void ExplainCountersInPassAndResultLocations(GpaApiType api, uint32_t device_id, - GpaUInt8 generate_asic_specific_counters, const std::vector& counters_to_enable, std::stringstream* output_stream); diff --git a/source/gpu_perf_api_unit_tests/counter_generator_vk_tests.cc b/source/gpu_perf_api_unit_tests/counter_generator_vk_tests.cc index 05627173..31143173 100644 --- a/source/gpu_perf_api_unit_tests/counter_generator_vk_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_generator_vk_tests.cc @@ -138,51 +138,61 @@ static std::vector GetExpectedPublicCounters(GpaHwGeneration gen TEST(CounterDllTests, VkUnsupportedHardwareGenerations) { - VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationNone, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationNvidia, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationIntel, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationGfx6, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationGfx7, FALSE); + VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationNone); + VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationNvidia); + VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationIntel); + VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationGfx6); + VerifyHardwareNotSupported(kGpaApiVulkan, kGpaHwGenerationGfx7); +} + +TEST(CounterDllTests, VkVerifyInvalidOpenContextParameters) +{ + VerifyInvalidOpenContextParameters(kGpaApiVulkan, kDevIdGfx11); } #ifdef _WIN32 // Test the Vulkan derived counter blocks. TEST(CounterDllTests, VulkanDerivedCounterBlocks) { - VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx8, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); - VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx9, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); - VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx10, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); - VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx103, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); - VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx11, FALSE, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); + VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx8, GetExpectedPublicCounters(kGpaHwGenerationGfx8)); + VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx9, GetExpectedPublicCounters(kGpaHwGenerationGfx9)); + VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx10, GetExpectedPublicCounters(kGpaHwGenerationGfx10)); + VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx103, GetExpectedPublicCounters(kGpaHwGenerationGfx103)); + VerifyDerivedCounterCount(kGpaApiVulkan, kGpaHwGenerationGfx11, GetExpectedPublicCounters(kGpaHwGenerationGfx11)); } #endif // Test the VK counter names on all supported hardware. TEST(CounterDllTests, VkCounterNamesByDeviceId) { - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnknown, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdSI, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdCI, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdCIHawaii, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdMi250X, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdMi210, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnsupported1, FALSE); - VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnsupported2, FALSE); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnknown); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdSI); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdCI); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdCIHawaii); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdMi250X); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdMi210); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnsupported1); + VerifyHardwareNotSupported(kGpaApiVulkan, kDevIdUnsupported2); std::vector derived_counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdVI, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx8, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx9, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx9, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx10, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx10, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx10_3, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx10_3, derived_counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11, FALSE, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11_0_3, FALSE, derived_counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11_0_3B, FALSE, derived_counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11, derived_counter_names, hardware_counter_names); + + // The variant hardware can only have the derived counter names verified. + // GetExpectedCountersForGeneration() method in our tests is not thorough enough to create + // the expected list of hardware counters for each variant. + std::vector empty_list_to_skip_tests; + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11_0_3, derived_counter_names, empty_list_to_skip_tests); + VerifyCounterNames(kGpaApiVulkan, kDevIdGfx11_0_3B, derived_counter_names, empty_list_to_skip_tests); } TEST(CounterDllTests, VkCounterNamesGfx8) @@ -190,7 +200,7 @@ TEST(CounterDllTests, VkCounterNamesGfx8) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); } TEST(CounterDllTests, VkCounterNamesGfx9) @@ -198,7 +208,7 @@ TEST(CounterDllTests, VkCounterNamesGfx9) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); } TEST(CounterDllTests, VkCounterNamesGfx10) @@ -206,7 +216,7 @@ TEST(CounterDllTests, VkCounterNamesGfx10) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); } TEST(CounterDllTests, VkCounterNamesGfx103) @@ -214,7 +224,7 @@ TEST(CounterDllTests, VkCounterNamesGfx103) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); } TEST(CounterDllTests, VkCounterNamesGfx11) @@ -222,7 +232,7 @@ TEST(CounterDllTests, VkCounterNamesGfx11) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } // Test the VK counter names on all generations. @@ -231,15 +241,15 @@ TEST(CounterDllTests, VkCounterNamesByGeneration) std::vector counter_names; std::vector hardware_counter_names; GetExpectedCountersForGeneration(kGpaHwGenerationGfx8, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx8, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx8, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx9, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx9, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx9, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx10, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx10, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx10, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx103, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx103, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx103, counter_names, hardware_counter_names); GetExpectedCountersForGeneration(kGpaHwGenerationGfx11, counter_names, hardware_counter_names); - VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx11, FALSE, counter_names, hardware_counter_names); + VerifyCounterNames(kGpaApiVulkan, kGpaHwGenerationGfx11, counter_names, hardware_counter_names); } TEST(CounterDllTests, VkOpenCounterContext) @@ -254,47 +264,559 @@ TEST(CounterDllTests, VkOpenCounterContext) #ifdef _WIN32 TEST(CounterDllTests, VkCounterLibTestGfx8) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdVI, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdVI, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdVI, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdVI, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx9) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx9, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx9, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx9, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx9, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx10) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx10, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx10, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx10, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx10, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx103) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx10_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx10_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx10_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx10_3, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx11) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx1103) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11_0_3, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11_0_3, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11_0_3, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11_0_3, REVISION_ID_ANY); } TEST(CounterDllTests, VkCounterLibTestGfx1103B) { - VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); - VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11_0_3B, REVISION_ID_ANY, false); + VerifyCounterLibInterface(kGpaApiVulkan, kDevIdGfx11_0_3B, REVISION_ID_ANY); + VerifyCounterByPassCounterLibEntry(kGpaApiVulkan, kDevIdGfx11_0_3B, REVISION_ID_ANY); } #endif +TEST(HardwareCounterTests, Vk_gfx1034_SqSqcPerfSelLdsBankConflict) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx10_3_4, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to SQ0_SQC_PERF_SEL_LDS_BANK_CONFLICT. + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockSq; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 285; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("SQ0_SQC_PERF_SEL_LDS_BANK_CONFLICT", counter_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx8_VgtPerfVgtTe11Busy) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx8, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to VGT0_PERF_VGT_TE11_BUSY. + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockVgt; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 124; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("VGT0_PERF_VGT_TE11_BUSY", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "VGT0_PERF_VGT_TE11_BUSY"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx8Tonga_VgtPerfVgtTe11Busy) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx8Tonga, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to VGT0_PERF_VGT_TE11_BUSY. + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockVgt; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 125; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("VGT0_PERF_VGT_TE11_BUSY", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "VGT0_PERF_VGT_TE11_BUSY"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx9_VgtPerfVgtTe11Busy) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx9, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to VGT0_PERF_VGT_TE11_BUSY. + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockVgt; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 125; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("VGT0_PERF_VGT_TE11_BUSY", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "VGT0_PERF_VGT_TE11_BUSY"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx10_Gl2cPerfSelMiss) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx10, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to GL2C0_PERF_SEL_MISS (which is at index 35 on Gfx10). + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockGl2C; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 35; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("GL2C0_PERF_SEL_MISS", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "GL2C0_PERF_SEL_MISS"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx103_Gl2cPerfSelMiss) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx10_3, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to GL2C0_PERF_SEL_MISS (which is at index 43 on Gfx10_3). + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockGl2C; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 43; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("GL2C0_PERF_SEL_MISS", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "GL2C0_PERF_SEL_MISS"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx1031_Gl2cPerfSelMiss) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx10_3_1, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to GL2C0_PERF_SEL_MISS (which is at index 43 on Gfx10_3_1). + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockGl2C; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 43; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("GL2C0_PERF_SEL_MISS", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "GL2C0_PERF_SEL_MISS"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx11_Gl2cPerfSelMiss) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx11, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to GL2C0_PERF_SEL_MISS (which is at index 43 on Gfx11). + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockGl2C; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 43; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("GL2C0_PERF_SEL_MISS", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "GL2C0_PERF_SEL_MISS"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + +TEST(HardwareCounterTests, Vk_gfx1103_Gl2cPerfSelMiss) +{ + LibHandle handle = nullptr; + GpaCounterLibFuncTable gpa_counter_lib_func_table = {}; + GpaCounterContext gpa_counter_context = nullptr; + if (LoadAndVerifyCounterLib(&handle, &gpa_counter_lib_func_table)) + { + GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, kDevIdGfx11_0_3, REVISION_ID_ANY, nullptr, 0}; + GpaStatus gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(kGpaApiVulkan, + counter_context_hardware_info, + kGpaOpenContextEnableHardwareCountersBit, + TRUE, + &gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // The counter information that corresponds to GL2C0_PERF_SEL_MISS (which is at index 43 on Gfx11_0_3). + GpaCounterParam param; + param.is_derived_counter = false; + param.gpa_hw_counter.gpa_hw_block = kGpaHwBlockGl2C; + param.gpa_hw_counter.gpa_hw_block_instance = 0; + param.gpa_hw_counter.gpa_hw_block_event_id = 43; + param.gpa_hw_counter.gpa_shader_mask = kGpaShaderMaskAll; + GpaUInt32 index = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m, &index); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + // Make sure the index points back to the same counter name. + const char* counter_name = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterName(gpa_counter_context, index, &counter_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_STREQ("GL2C0_PERF_SEL_MISS", counter_name); + + // The counter should also be queriable by name as a derived counter, and point to the same index. + GpaCounterParam param_by_name; + param_by_name.is_derived_counter = true; + param_by_name.derived_counter_name = "GL2C0_PERF_SEL_MISS"; + GpaUInt32 index_by_name = 0; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterIndex(gpa_counter_context, ¶m_by_name, &index_by_name); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(index, index_by_name); + + // Now make sure that getting the counter information for that index properly returns the same counter information that was supplied above. + const GpaCounterInfo* counter_info = nullptr; + gpa_status = gpa_counter_lib_func_table.GpaCounterLibGetCounterInfo(gpa_counter_context, index, &counter_info); + EXPECT_EQ(kGpaStatusOk, gpa_status); + EXPECT_EQ(param.is_derived_counter, counter_info->is_derived_counter); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block, counter_info->gpa_hw_counter->gpa_hw_block); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_instance, counter_info->gpa_hw_counter->gpa_hw_block_instance); + EXPECT_EQ(param.gpa_hw_counter.gpa_hw_block_event_id, counter_info->gpa_hw_counter->gpa_hw_block_event_id); + EXPECT_EQ(param.gpa_hw_counter.gpa_shader_mask, counter_info->gpa_hw_counter->gpa_shader_mask); + + gpa_status = gpa_counter_lib_func_table.GpaCounterLibCloseCounterContext(gpa_counter_context); + EXPECT_EQ(kGpaStatusOk, gpa_status); + + UnloadLib(handle); + } +} + TEST(CounterDllTests, VkCounterFormulaTest) { VerifyCounterFormula(GetExpectedPublicCounters(kGpaHwGenerationGfx8)); diff --git a/source/gpu_perf_api_unit_tests/counter_scheduler_tests.cc b/source/gpu_perf_api_unit_tests/counter_scheduler_tests.cc index 6af24404..e9c0372d 100644 --- a/source/gpu_perf_api_unit_tests/counter_scheduler_tests.cc +++ b/source/gpu_perf_api_unit_tests/counter_scheduler_tests.cc @@ -1,5 +1,5 @@ //============================================================================== -// Copyright (c) 2012-2021 Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2012-2023 Advanced Micro Devices, Inc. All rights reserved. /// @author AMD Developer Tools Team /// @file /// @brief Unit tests for Counter Scheduler. @@ -48,7 +48,7 @@ TEST(CounterDllTests, OpenCLCounterSchedulingVi) counters.push_back(1); counters.push_back(2); - VerifyPassCount(kGpaApiOpencl, kDevIdVI, FALSE, counters, 1); + VerifyPassCount(kGpaApiOpencl, kDevIdVI, counters, 1); } // Counters to enable (Wavefronts, VALUInsts, SALUInsts, VFetchInsts, SFetchInsts, VWriteInsts, VALUUtilization, VALUBusy, SALUBusy). @@ -129,7 +129,7 @@ TEST(CounterDllTests, OpenClResultLocations) {VALUBUSY_PUBLIC_CL_GFX8, expected_locations_valu_busy}, {SALUBUSY_PUBLIC_CL_GFX8, expected_locations_salu_busy}}; - VerifyCountersInPass(kGpaApiOpencl, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiOpencl, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } #pragma endregion @@ -267,7 +267,7 @@ TEST(CounterDllTests, OpenClResultLocations) {VALUBUSY_PUBLIC_CL_GFX9, expected_locations7}, {SALUBUSY_PUBLIC_CL_GFX9, expected_locations8}}; - VerifyCountersInPass(kGpaApiOpencl, kDevIdGfx9, FALSE, counters, expected_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiOpencl, kDevIdGfx9, counters, expected_counters_per_pass, expected_result_locations); } #pragma endregion } @@ -279,7 +279,7 @@ TEST(CounterDllTests, OpenGlCounterScheduling) counters.push_back(GPUTIME_PUBLIC_GL_GFX8); counters.push_back(GPUBUSY_PUBLIC_GL_GFX8); counters.push_back(TESSELLATORBUSY_PUBLIC_GL_GFX8); - VerifyPassCount(kGpaApiOpengl, kDevIdVI, FALSE, counters, 2); + VerifyPassCount(kGpaApiOpengl, kDevIdVI, counters, 2); } #ifdef _WIN32 @@ -290,7 +290,7 @@ TEST(CounterDllTests, Dx11CounterScheduling) counters.push_back(GPUTIME_PUBLIC_DX11_GFX8); counters.push_back(GPUBUSY_PUBLIC_DX11_GFX8); counters.push_back(TESSELLATORBUSY_PUBLIC_DX11_GFX8); - VerifyPassCount(kGpaApiDirectx11, kDevIdVI, FALSE, counters, 2); + VerifyPassCount(kGpaApiDirectx11, kDevIdVI, counters, 2); } TEST(CounterDllTests, Dx11Gfx8BusyCounters) @@ -383,7 +383,7 @@ TEST(CounterDllTests, Dx11Gfx8BusyCounters) {PSBUSY_PUBLIC_DX11_GFX8, expected_location_psbusy}, {CSBUSY_PUBLIC_DX11_GFX8, expected_locations_csbusy}}; - VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); #pragma endregion } } @@ -498,7 +498,7 @@ TEST(CounterDllTests, Dx11Gfx9BusyCounters) {CSBUSY_PUBLIC_DX11_GFX9, expected_locations4}, }; - VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, counters, expected_hw_counters_per_pass, expected_result_locations); #pragma endregion } } @@ -565,7 +565,7 @@ std::map > expected_resul {HSTIME_PUBLIC_DX11_GFX8, expected_locations_hstime}, {GSTIME_PUBLIC_DX11_GFX8, expected_locations_gstime}}; -VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); +VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } #pragma endregion } @@ -628,7 +628,7 @@ std::vector > expected_hw_counters_per_pass = { std::map > expected_result_locations = {{PRETESSELLATIONTIME_PUBLIC_DX11_GFX9, expected_locations0}, {POSTTESSELLATIONTIME_PUBLIC_DX11_GFX9, expected_locations1}}; -VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); +VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, counters, expected_hw_counters_per_pass, expected_result_locations); } #pragma endregion } @@ -685,7 +685,7 @@ std::vector > expected_hw_counters_per_pass = { std::map > expected_result_locations; expected_result_locations[VSBUSY_PUBLIC_DX11_GFX8] = expected_locations_vsbusy; -VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); +VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } #pragma endregion } @@ -715,7 +715,7 @@ TEST(CounterDllTests, DX11Gfx9VsBusy) std::map > expected_result_locations = {{VSGSBUSY_PUBLIC_DX11_GFX9, expected_locations0}}; - VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, counters, expected_hw_counters_per_pass, expected_result_locations); } #pragma endregion } @@ -745,40 +745,40 @@ void TestGpuTimeVSBusyVSTimeCountersForDevice(unsigned int device_id) } // counters to enable (GPUTime, VSBusy) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{gpu_time_index, vs_busy_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{gpu_time_index, vs_busy_index}, expected_passes); // counters to enable (VSBusy, GPUTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_busy_index, gpu_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_busy_index, gpu_time_index}, expected_passes); // counters to enable (VSBusy, VSTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_busy_index, vs_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_busy_index, vs_time_index}, expected_passes); // counters to enable (VSTime, VSBusy) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_time_index, vs_busy_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_time_index, vs_busy_index}, expected_passes); // counters to enable (GPUTime, VSTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{gpu_time_index, vs_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{gpu_time_index, vs_time_index}, expected_passes); // counters to enable (VSTime, GPUTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_time_index, gpu_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_time_index, gpu_time_index}, expected_passes); // counters to enable (GPUTime, VSBusy, VSTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{gpu_time_index, vs_busy_index, vs_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{gpu_time_index, vs_busy_index, vs_time_index}, expected_passes); // counters to enable (GPUTime, VSTime, VSBusy) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{gpu_time_index, vs_time_index, vs_busy_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{gpu_time_index, vs_time_index, vs_busy_index}, expected_passes); // counters to enable (VSTime, GPUTime, VSBusy) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_time_index, gpu_time_index, vs_busy_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_time_index, gpu_time_index, vs_busy_index}, expected_passes); // counters to enable (VSTime, VSBusy, GPUTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_time_index, vs_busy_index, gpu_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_time_index, vs_busy_index, gpu_time_index}, expected_passes); // counters to enable (VSBusy, GPUTime, VSTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_busy_index, gpu_time_index, vs_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_busy_index, gpu_time_index, vs_time_index}, expected_passes); // counters to enable (VSBusy, VSTime, GPUTime) - VerifyPassCount(kGpaApiDirectx11, device_id, FALSE, std::vector{vs_busy_index, vs_time_index, gpu_time_index}, expected_passes); + VerifyPassCount(kGpaApiDirectx11, device_id, std::vector{vs_busy_index, vs_time_index, gpu_time_index}, expected_passes); } TEST(CounterDllTests, Dx11ViGpuTimeVsBusyVsTimeCounters) @@ -852,7 +852,7 @@ void TestD3D11QueryCounter(unsigned int device_id, expected_result_locations[query_counter_index] = expected_locations_d3d_query; - VerifyCountersInPass(kGpaApiDirectx11, device_id, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, device_id, counters, expected_hw_counters_per_pass, expected_result_locations); } TEST(CounterDllTests, Dx11ViPsFBusyCounterResult) @@ -864,29 +864,32 @@ TEST(CounterDllTests, Dx11ViPsFBusyCounterResult) // each result is 64 bit, so 8 chars. GpaUInt64* all_results = new (std::nothrow) GpaUInt64[required_count * 8]; ASSERT_TRUE(nullptr != all_results); - memset(all_results, 0, required_count * 8); - - all_results[0 * 8] = 1; - all_results[1 * 8] = 1; - all_results[2 * 8] = 1; - all_results[3 * 8] = 1; - all_results[4 * 8] = 1; - all_results[5 * 8] = 1; - all_results[6 * 8] = 1; - all_results[7 * 8] = 1; - all_results[8 * 8] = 2; // GUI_ACTIVE - - // copy results into the vector - std::vector sample_results; - - for (unsigned int i = 0; i < required_count; i++) + if (all_results != nullptr) { - sample_results.push_back(&(all_results[i * 8])); - } + memset(all_results, 0, required_count * 8); + + all_results[0 * 8] = 1; + all_results[1 * 8] = 1; + all_results[2 * 8] = 1; + all_results[3 * 8] = 1; + all_results[4 * 8] = 1; + all_results[5 * 8] = 1; + all_results[6 * 8] = 1; + all_results[7 * 8] = 1; + all_results[8 * 8] = 2; // GUI_ACTIVE + + // copy results into the vector + std::vector sample_results; + + for (unsigned int i = 0; i < required_count; i++) + { + sample_results.push_back(&(all_results[i * 8])); + } - VerifyCounterCalculation(kGpaApiDirectx11, kDevIdVI, FALSE, "PSBusy", sample_results, 50); + VerifyCounterCalculation(kGpaApiDirectx11, kDevIdVI, "PSBusy", sample_results, 50); - delete[] all_results; + delete[] all_results; + } } TEST(CounterDllTests, Dx11EnableAndDisable) @@ -896,6 +899,10 @@ TEST(CounterDllTests, Dx11EnableAndDisable) HMODULE dll = LoadLibraryA("GPUPerfAPICounters" AMDT_PROJECT_SUFFIX ".dll"); ASSERT_NE((HMODULE) nullptr, dll); + if (dll == nullptr) + { + return; + } GpaCounterLibGetFuncTablePtrType get_func_table_ptr = reinterpret_cast(GetProcAddress(dll, "GpaCounterLibGetFuncTable")); ASSERT_NE((GpaCounterLibGetFuncTablePtrType) nullptr, get_func_table_ptr); @@ -906,7 +913,7 @@ TEST(CounterDllTests, Dx11EnableAndDisable) GpaCounterContextHardwareInfo counter_context_hardware_info = {kAmdVendorId, device_id, REVISION_ID_ANY, nullptr, 0}; GpaCounterContext gpa_counter_context; - gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, kGpaOpenContextDefaultBit, FALSE, &gpa_counter_context); + gpa_status = gpa_counter_lib_func_table.GpaCounterLibOpenCounterContext(api, counter_context_hardware_info, kGpaOpenContextDefaultBit, TRUE, &gpa_counter_context); EXPECT_EQ(kGpaStatusOk, gpa_status); std::vector enable_counter_list; @@ -1060,7 +1067,7 @@ TEST(CounterDllTests, SqIsolatedCounterSplitScheduler) std::map > expected_result_locations = { {CSVFETCHINSTS_PUBLIC_DX11_GFX8, expected_locations0}}; - VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } /// GPA-159 Validation Test @@ -1131,7 +1138,7 @@ TEST(CounterDllTests, Gpa159MultipleTimingCounters) {PSBUSYCYCLES_PUBLIC_DX12_GFX8, expected_locations2}, {PSTIME_PUBLIC_DX12_GFX8, expected_locations3}}; - VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } TEST(CounterDllTests, Gpa85MultipleTimingCounters) @@ -1461,7 +1468,7 @@ TEST(CounterDllTests, Gpa85MultipleTimingCounters) {VSTIME_PUBLIC_DX12_GFX8, expected_locations22}, }; - VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } // GPA-83: Consolidated counter scheduler no longer schedules multi-pass public @@ -1522,7 +1529,7 @@ TEST(CounterDllTests, Gpa83ThreePassTest) std::map > expected_result_locations = { {VSVERTICESIN_PUBLIC_DX12_GFX8, expected_locations0}, {GPUTIME_PUBLIC_DX12_GFX8, expected_locations1}, {VSBUSY_PUBLIC_DX12_GFX8, expected_locations2}}; - VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx12, kDevIdGfx8, counters, expected_hw_counters_per_pass, expected_result_locations); } // SWDEV-140743: DX11 Vega L1 Cache Counters (TCP Block Instance) Always Zero @@ -1888,7 +1895,7 @@ TEST(CounterDllTests, SwDev140743) std::map > expected_result_locations = {{L1CACHEHITCOUNT_PUBLIC_DX11_GFX9, expected_locations0}}; - VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, FALSE, counters, expected_hw_counters_per_pass, expected_result_locations); + VerifyCountersInPass(kGpaApiDirectx11, kDevIdGfx9, counters, expected_hw_counters_per_pass, expected_result_locations); } #endif // _WIN32s diff --git a/source/gpu_perf_api_vk/CMakeLists.txt b/source/gpu_perf_api_vk/CMakeLists.txt index ff646351..105f9494 100644 --- a/source/gpu_perf_api_vk/CMakeLists.txt +++ b/source/gpu_perf_api_vk/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/public_counter_compiler/CMakeLists.txt b/source/public_counter_compiler/CMakeLists.txt index e23dd7f4..f4498c00 100644 --- a/source/public_counter_compiler/CMakeLists.txt +++ b/source/public_counter_compiler/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) enable_language(CSharp) diff --git a/source/public_counter_compiler/CounterDefCmakeGen.cs b/source/public_counter_compiler/CounterDefCmakeGen.cs index b07dd744..2a3a8048 100644 --- a/source/public_counter_compiler/CounterDefCmakeGen.cs +++ b/source/public_counter_compiler/CounterDefCmakeGen.cs @@ -112,7 +112,7 @@ public static void CMakeWriter() Gpa.counterDefinitionsStr + api.Key + ".cmake"; CMakeWriter = new StreamWriter(CMakeFileName); CMakeWriter.WriteLine("## Copyright (c) {0} Advanced Micro Devices, Inc. All rights reserved.", DateTime.Today.Year); - CMakeWriter.WriteLine("cmake_minimum_required(VERSION 3.5.1)"); + CMakeWriter.WriteLine("cmake_minimum_required(VERSION 3.10)"); CMakeWriter.WriteLine(); CMakeWriter.WriteLine("set(CMAKE_INCLUDE_CURRENT_DIR ON)"); } @@ -165,7 +165,7 @@ public static void CMakeWriter() Gpa.derivedCounterOutFileName + api.Key + ".cmake"; CMakeWriter = new StreamWriter(CMakeFileName); CMakeWriter.WriteLine("## Copyright (c) {0} Advanced Micro Devices, Inc. All rights reserved.", DateTime.Today.Year); - CMakeWriter.WriteLine("cmake_minimum_required(VERSION 3.5.1)"); + CMakeWriter.WriteLine("cmake_minimum_required(VERSION 3.10)"); CMakeWriter.WriteLine(); CMakeWriter.WriteLine("set(CMAKE_INCLUDE_CURRENT_DIR ON)"); } diff --git a/source/public_counter_compiler_input_files/CMakeLists.txt b/source/public_counter_compiler_input_files/CMakeLists.txt index ee612df2..90a197ff 100644 --- a/source/public_counter_compiler_input_files/CMakeLists.txt +++ b/source/public_counter_compiler_input_files/CMakeLists.txt @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2020 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) set(DEPTH "../../") diff --git a/source/public_counter_compiler_input_files/public_counter_definitions_gfx10.txt b/source/public_counter_compiler_input_files/public_counter_definitions_gfx10.txt index ce451e62..2359f567 100644 --- a/source/public_counter_compiler_input_files/public_counter_definitions_gfx10.txt +++ b/source/public_counter_compiler_input_files/public_counter_definitions_gfx10.txt @@ -2706,7 +2706,7 @@ type=gpa_float64 usage=cycles [GLGfx10] TA*_PERF_SEL_TA_BUSY[0..15] -eqn=0..15,max16 +eqn=0..15,max16,NUM_SHADER_ARRAYS,/ [DX11Gfx10] [DX12Gfx10] [OGLPGfx10] diff --git a/source/public_counter_compiler_input_files/public_counter_definitions_gfx103.txt b/source/public_counter_compiler_input_files/public_counter_definitions_gfx103.txt index d68dae99..7efc62a2 100644 --- a/source/public_counter_compiler_input_files/public_counter_definitions_gfx103.txt +++ b/source/public_counter_compiler_input_files/public_counter_definitions_gfx103.txt @@ -2092,7 +2092,7 @@ type=gpa_float64 usage=cycles [GLGfx103] TA*_PERF_SEL_TA_BUSY[0..15] -eqn=0..15,max16 +eqn=0..15,max16,NUM_SHADER_ARRAYS,/ [DX11Gfx103] [DX12Gfx103] [OGLPGfx103] @@ -2156,7 +2156,7 @@ GL2C*_PERF_SEL_MC_WRREQ_STALL[0..15] eqn=0..15,max16 name=LocalVidMemBytes -desc=#GlobalMemory#Number of bytes read from or written to local video memory +desc=#GlobalMemory#Number of bytes read from or written to the Infinity Cache (if available) or local video memory type=gpa_float64 usage=bytes [DX12Gfx103] diff --git a/source/public_counter_compiler_input_files/public_counter_definitions_gfx11.txt b/source/public_counter_compiler_input_files/public_counter_definitions_gfx11.txt index 2aca6880..6abf8692 100644 --- a/source/public_counter_compiler_input_files/public_counter_definitions_gfx11.txt +++ b/source/public_counter_compiler_input_files/public_counter_definitions_gfx11.txt @@ -1522,7 +1522,7 @@ GL2C*_PERF_SEL_MC_WRREQ_STALL[0..23] eqn=0..23,max24 name=LocalVidMemBytes -desc=#GlobalMemory#Number of bytes read from or written to local video memory +desc=#GlobalMemory#Number of bytes read from or written to the Infinity Cache (if available) or local video memory type=gpa_float64 usage=bytes [OGLPGfx11] diff --git a/source/public_counter_compiler_input_files/public_counter_definitions_gfx8.txt b/source/public_counter_compiler_input_files/public_counter_definitions_gfx8.txt index da505a63..38992d1a 100644 --- a/source/public_counter_compiler_input_files/public_counter_definitions_gfx8.txt +++ b/source/public_counter_compiler_input_files/public_counter_definitions_gfx8.txt @@ -2645,7 +2645,7 @@ type=gpa_float64 usage=cycles [GLGfx8] TA*_PERF_SEL_TA_BUSY[0..15] -eqn=0..15,max16 +eqn=0..15,max16,NUM_SHADER_ENGINES,/ [DX11Gfx8] [DX12Gfx8] [OGLPGfx8] diff --git a/source/public_counter_compiler_input_files/public_counter_definitions_gfx9.txt b/source/public_counter_compiler_input_files/public_counter_definitions_gfx9.txt index 8abe21ec..99d5293c 100644 --- a/source/public_counter_compiler_input_files/public_counter_definitions_gfx9.txt +++ b/source/public_counter_compiler_input_files/public_counter_definitions_gfx9.txt @@ -2514,7 +2514,7 @@ type=gpa_float64 usage=cycles [GLGfx9] TA*_PERF_SEL_TA_BUSY[0..15] -eqn=0..15,max16 +eqn=0..15,max16,NUM_SHADER_ENGINES,/ [DX11Gfx9] [DX12Gfx9] [OGLPGfx9] diff --git a/source/third_party/AmdDxExt/Global-AmdDxExt.cmake b/source/third_party/AmdDxExt/Global-AmdDxExt.cmake index 74f007ae..86382783 100644 --- a/source/third_party/AmdDxExt/Global-AmdDxExt.cmake +++ b/source/third_party/AmdDxExt/Global-AmdDxExt.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) ## Define AMD DirectX extension directory set(AMD_DX_EXT_DIR ${GPA_SRC_THIRD_PARTY}/AmdDxExt) diff --git a/source/third_party/AmdVkExt/Global-AmdVkExt.cmake b/source/third_party/AmdVkExt/Global-AmdVkExt.cmake index 1f428103..ece372e9 100644 --- a/source/third_party/AmdVkExt/Global-AmdVkExt.cmake +++ b/source/third_party/AmdVkExt/Global-AmdVkExt.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) ## Define Vulkan extension directory set(AMD_VK_EXT_DIR ${GPA_SRC_THIRD_PARTY}/AmdVkExt) diff --git a/source/third_party/CMakeModules/Global-Common.cmake b/source/third_party/CMakeModules/Global-Common.cmake index de58f206..fc3ede8d 100644 --- a/source/third_party/CMakeModules/Global-Common.cmake +++ b/source/third_party/CMakeModules/Global-Common.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) include(${CMAKE_CURRENT_LIST_DIR}/Global-Internal.cmake) diff --git a/source/third_party/CMakeModules/Global-Internal.cmake b/source/third_party/CMakeModules/Global-Internal.cmake index 40047864..ad5246c0 100644 --- a/source/third_party/CMakeModules/Global-Internal.cmake +++ b/source/third_party/CMakeModules/Global-Internal.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +## Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) if (NOT DEFINED AMDT_INTERNAL_BUILD_FLAG) set(AMDT_INTERNAL_BUILD_FLAG OFF) diff --git a/source/third_party/CMakeModules/Global-x64.cmake b/source/third_party/CMakeModules/Global-x64.cmake index 5d54926a..714307dc 100644 --- a/source/third_party/CMakeModules/Global-x64.cmake +++ b/source/third_party/CMakeModules/Global-x64.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) if(NOT DEFINED AMDTPlatform) set(AMDTPlatform "x64") diff --git a/source/third_party/CMakeModules/Global-x86.cmake b/source/third_party/CMakeModules/Global-x86.cmake index d31aac51..e0013a35 100644 --- a/source/third_party/CMakeModules/Global-x86.cmake +++ b/source/third_party/CMakeModules/Global-x86.cmake @@ -1,5 +1,5 @@ ## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.5.1) +cmake_minimum_required(VERSION 3.10) if(NOT DEFINED AMDTPlatform) set(AMDTPlatform "x86") diff --git a/source/third_party/Vulkan/Global-Vulkan.cmake b/source/third_party/Vulkan/Global-Vulkan.cmake index b005600c..f551e1de 100644 --- a/source/third_party/Vulkan/Global-Vulkan.cmake +++ b/source/third_party/Vulkan/Global-Vulkan.cmake @@ -1,5 +1,5 @@ -## Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved. -cmake_minimum_required(VERSION 3.7.2) +## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved. +cmake_minimum_required(VERSION 3.10) find_package(Vulkan) if(${Vulkan_FOUND})