From e8983f527480e6586b7b57b550cf4dd5472d5415 Mon Sep 17 00:00:00 2001 From: Krzysztof Gibala Date: Fri, 22 Mar 2024 10:27:09 +0000 Subject: [PATCH] fix: Detect FtrHwScheduling on WSL Related-To: NEO-10212 Signed-off-by: Krzysztof Gibala --- shared/source/os_interface/windows/sharedata_wrapper.h | 4 +++- .../source/wsl_compute_helper_types_demarshall.h | 8 +++++++- .../source/wsl_compute_helper_types_tokens.h | 3 ++- .../source/wsl_compute_helper_types_tokens_structs.h | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/shared/source/os_interface/windows/sharedata_wrapper.h b/shared/source/os_interface/windows/sharedata_wrapper.h index 794ab06c7a..14f76b1caf 100644 --- a/shared/source/os_interface/windows/sharedata_wrapper.h +++ b/shared/source/os_interface/windows/sharedata_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -94,6 +94,8 @@ struct SKU_FEATURE_TABLE_KMD : SKU_FEATURE_TABLE_GMM { // NOLINT(readability-ide bool FtrRcsNode : 1; // NOLINT(readability-identifier-naming) bool FtrLocalMemory : 1; // NOLINT(readability-identifier-naming) bool FtrLocalMemoryAllows4KB : 1; // NOLINT(readability-identifier-naming) + + bool FtrHwScheduling : 1; // NOLINT(readability-identifier-naming) }; struct WA_TABLE_KMD : WA_TABLE_GMM { // NOLINT(readability-identifier-naming) diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h index 1798e345ee..9a7b2a461f 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_demarshall.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1850,6 +1850,9 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_DRIVER_FLR: { dst.FtrDriverFLR = readTokValue(*tok); } break; + case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_HW_SCHEDULING: { + dst.FtrHwScheduling = readTokValue(*tok); + } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_LDR2D: { dst.FtrAstcLdr2D = readTokValue(*tok); } break; @@ -3050,6 +3053,9 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_DRIVER_FLR: { dst.SkuTable.FtrDriverFLR = readTokValue(*tokSkuTable); } break; + case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_HW_SCHEDULING: { + dst.SkuTable.FtrHwScheduling = readTokValue(*tokSkuTable); + } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_LDR2D: { dst.SkuTable.FtrAstcLdr2D = readTokValue(*tokSkuTable); } break; diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h index 5326f2bca2..8f1139e7a6 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -468,6 +468,7 @@ enum TOK : uint32_t { TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_KMD_DAF = 668, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_FRAME_BUFFER_LLC = 679, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_DRIVER_FLR = 681, + TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_HW_SCHEDULING = 689, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_LDR2D = 726, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_HDR2D = 727, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC3D = 728, diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h index 901eec2912..1ce897e109 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -525,6 +525,7 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrKmdDaf = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_KMD_DAF}; TokenDword FtrFrameBufferLLC = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_FRAME_BUFFER_LLC}; TokenDword FtrDriverFLR = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_DRIVER_FLR}; + TokenDword FtrHwScheduling = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_HW_SCHEDULING}; }; static_assert(std::is_standard_layout_v, ""); static_assert(sizeof(TOKSTR_ANONYMOUS21990) % sizeof(uint32_t) == 0, ""); @@ -643,6 +644,7 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrKmdDaf = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_KMD_DAF}; // Indirect field from anonymous struct TokenDword FtrFrameBufferLLC = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_FRAME_BUFFER_LLC}; // Indirect field from anonymous struct TokenDword FtrDriverFLR = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_DRIVER_FLR}; // Indirect field from anonymous struct + TokenDword FtrHwScheduling = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS21990__FTR_HW_SCHEDULING}; // Indirect field from anonymous struct TokenDword FtrAstcLdr2D = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_LDR2D}; // Indirect field from anonymous struct TokenDword FtrAstcHdr2D = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC_HDR2D}; // Indirect field from anonymous struct TokenDword FtrAstc3D = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS37751__FTR_ASTC3D}; // Indirect field from anonymous struct