From 90d85bee554fedfa9b52e547f73b458a07bcd5aa Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Thu, 27 Jan 2022 11:41:22 +0000 Subject: [PATCH] Remove ftrGT flags support Signed-off-by: Bartosz Dunajski --- .../cfl/linux/dll/device_id_tests_cfl.cpp | 3 - .../sku_info/sku_info_base_reference.h | 16 +---- .../source/offline_compiler.cpp | 18 ----- .../compiler_interface/compiler_interface.cpp | 21 +----- .../os_interface/windows/sharedata_wrapper.h | 16 +---- .../operations/windows/sku_info_receiver.h | 16 +---- shared/source/sku_info/sku_info_base.h | 18 +---- .../wsl_compute_helper_types_demarshall.h | 72 ------------------- .../wsl_compute_helper_types_marshall.h | 25 +------ .../source/wsl_compute_helper_types_tokens.h | 12 ---- .../wsl_compute_helper_types_tokens_structs.h | 24 ------- 11 files changed, 7 insertions(+), 234 deletions(-) diff --git a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp index b3aca2c563..fcc5eb5621 100644 --- a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp @@ -35,7 +35,6 @@ TEST_F(DeviceIdTests, GivenCflSupportedDeviceIdThenHardwareInfoIsCorrect) { {0x3EA5, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo}, {0x3EA2, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo}, - // CML GT1 {0x9B21, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, {0x9BAA, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, {0x9BAB, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, @@ -45,7 +44,6 @@ TEST_F(DeviceIdTests, GivenCflSupportedDeviceIdThenHardwareInfoIsCorrect) { {0x9BA8, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, {0x9BA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, {0x9BA2, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo}, - // CML GT2 {0x9B41, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BCA, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BCB, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, @@ -55,7 +53,6 @@ TEST_F(DeviceIdTests, GivenCflSupportedDeviceIdThenHardwareInfoIsCorrect) { {0x9BC8, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BC4, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BC2, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, - // CML WORKSTATION {0x9BC6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BE6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, {0x9BF6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo}, diff --git a/opencl/test/unit_test/sku_info/sku_info_base_reference.h b/opencl/test/unit_test/sku_info/sku_info_base_reference.h index 80b8598259..1cbaacec46 100644 --- a/opencl/test/unit_test/sku_info/sku_info_base_reference.h +++ b/opencl/test/unit_test/sku_info/sku_info_base_reference.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -71,22 +71,8 @@ struct SkuInfoBaseReference { refFtrTable.flags.ftrDesktop = true; refFtrTable.flags.ftrChannelSwizzlingXOREnabled = true; - refFtrTable.flags.ftrGtBigDie = true; - refFtrTable.flags.ftrGtMediumDie = true; - refFtrTable.flags.ftrGtSmallDie = true; - - refFtrTable.flags.ftrGT1 = true; - refFtrTable.flags.ftrGT1_5 = true; - refFtrTable.flags.ftrGT2 = true; - refFtrTable.flags.ftrGT2_5 = true; - refFtrTable.flags.ftrGT3 = true; - refFtrTable.flags.ftrGT4 = true; - refFtrTable.flags.ftrIVBM0M1Platform = true; refFtrTable.flags.ftrSGTPVSKUStrapPresent = true; - refFtrTable.flags.ftrGTA = true; - refFtrTable.flags.ftrGTC = true; - refFtrTable.flags.ftrGTX = true; refFtrTable.flags.ftr5Slice = true; refFtrTable.flags.ftrGpGpuMidBatchPreempt = true; diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp index 9e78df4e07..45a5cbd2a1 100644 --- a/shared/offline_compiler/source/offline_compiler.cpp +++ b/shared/offline_compiler/source/offline_compiler.cpp @@ -607,26 +607,8 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector & igcFtrWa.get()->SetFtrDesktop(hwInfo.featureTable.flags.ftrDesktop); igcFtrWa.get()->SetFtrChannelSwizzlingXOREnabled(hwInfo.featureTable.flags.ftrChannelSwizzlingXOREnabled); - - igcFtrWa.get()->SetFtrGtBigDie(hwInfo.featureTable.flags.ftrGtBigDie); - igcFtrWa.get()->SetFtrGtMediumDie(hwInfo.featureTable.flags.ftrGtMediumDie); - igcFtrWa.get()->SetFtrGtSmallDie(hwInfo.featureTable.flags.ftrGtSmallDie); - - igcFtrWa.get()->SetFtrGT1(hwInfo.featureTable.flags.ftrGT1); - igcFtrWa.get()->SetFtrGT1_5(hwInfo.featureTable.flags.ftrGT1_5); - igcFtrWa.get()->SetFtrGT2(hwInfo.featureTable.flags.ftrGT2); - igcFtrWa.get()->SetFtrGT3(hwInfo.featureTable.flags.ftrGT3); - igcFtrWa.get()->SetFtrGT4(hwInfo.featureTable.flags.ftrGT4); - igcFtrWa.get()->SetFtrIVBM0M1Platform(hwInfo.featureTable.flags.ftrIVBM0M1Platform); - igcFtrWa.get()->SetFtrGTL(hwInfo.featureTable.flags.ftrGT1); - igcFtrWa.get()->SetFtrGTM(hwInfo.featureTable.flags.ftrGT2); - igcFtrWa.get()->SetFtrGTH(hwInfo.featureTable.flags.ftrGT3); - igcFtrWa.get()->SetFtrSGTPVSKUStrapPresent(hwInfo.featureTable.flags.ftrSGTPVSKUStrapPresent); - igcFtrWa.get()->SetFtrGTA(hwInfo.featureTable.flags.ftrGTA); - igcFtrWa.get()->SetFtrGTC(hwInfo.featureTable.flags.ftrGTC); - igcFtrWa.get()->SetFtrGTX(hwInfo.featureTable.flags.ftrGTX); igcFtrWa.get()->SetFtr5Slice(hwInfo.featureTable.flags.ftr5Slice); auto compilerHwInfoConfig = CompilerHwInfoConfig::get(hwInfo.platform.eProductFamily); diff --git a/shared/source/compiler_interface/compiler_interface.cpp b/shared/source/compiler_interface/compiler_interface.cpp index 7921e10ec1..e5dbbcc7e0 100644 --- a/shared/source/compiler_interface/compiler_interface.cpp +++ b/shared/source/compiler_interface/compiler_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -440,28 +440,9 @@ IGC::IgcOclDeviceCtxTagOCL *CompilerInterface::getIgcDeviceCtx(const Device &dev igcFtrWa.get()->SetFtrDesktop(device.getHardwareInfo().featureTable.flags.ftrDesktop); igcFtrWa.get()->SetFtrChannelSwizzlingXOREnabled(device.getHardwareInfo().featureTable.flags.ftrChannelSwizzlingXOREnabled); - - igcFtrWa.get()->SetFtrGtBigDie(device.getHardwareInfo().featureTable.flags.ftrGtBigDie); - igcFtrWa.get()->SetFtrGtMediumDie(device.getHardwareInfo().featureTable.flags.ftrGtMediumDie); - igcFtrWa.get()->SetFtrGtSmallDie(device.getHardwareInfo().featureTable.flags.ftrGtSmallDie); - - igcFtrWa.get()->SetFtrGT1(device.getHardwareInfo().featureTable.flags.ftrGT1); - igcFtrWa.get()->SetFtrGT1_5(device.getHardwareInfo().featureTable.flags.ftrGT1_5); - igcFtrWa.get()->SetFtrGT2(device.getHardwareInfo().featureTable.flags.ftrGT2); - igcFtrWa.get()->SetFtrGT3(device.getHardwareInfo().featureTable.flags.ftrGT3); - igcFtrWa.get()->SetFtrGT4(device.getHardwareInfo().featureTable.flags.ftrGT4); - igcFtrWa.get()->SetFtrIVBM0M1Platform(device.getHardwareInfo().featureTable.flags.ftrIVBM0M1Platform); - igcFtrWa.get()->SetFtrGTL(device.getHardwareInfo().featureTable.flags.ftrGT1); - igcFtrWa.get()->SetFtrGTM(device.getHardwareInfo().featureTable.flags.ftrGT2); - igcFtrWa.get()->SetFtrGTH(device.getHardwareInfo().featureTable.flags.ftrGT3); - igcFtrWa.get()->SetFtrSGTPVSKUStrapPresent(device.getHardwareInfo().featureTable.flags.ftrSGTPVSKUStrapPresent); - igcFtrWa.get()->SetFtrGTA(device.getHardwareInfo().featureTable.flags.ftrGTA); - igcFtrWa.get()->SetFtrGTC(device.getHardwareInfo().featureTable.flags.ftrGTC); - igcFtrWa.get()->SetFtrGTX(device.getHardwareInfo().featureTable.flags.ftrGTX); igcFtrWa.get()->SetFtr5Slice(device.getHardwareInfo().featureTable.flags.ftr5Slice); - igcFtrWa.get()->SetFtrGpGpuMidThreadLevelPreempt(CompilerHwInfoConfig::get(hwInfo->platform.eProductFamily)->isMidThreadPreemptionSupported(*hwInfo)); igcFtrWa.get()->SetFtrIoMmuPageFaulting(device.getHardwareInfo().featureTable.flags.ftrIoMmuPageFaulting); igcFtrWa.get()->SetFtrWddm2Svm(device.getHardwareInfo().featureTable.flags.ftrWddm2Svm); diff --git a/shared/source/os_interface/windows/sharedata_wrapper.h b/shared/source/os_interface/windows/sharedata_wrapper.h index d1b65b3088..3085362bf9 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 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -51,22 +51,8 @@ struct SKU_FEATURE_TABLE_KMD : SKU_FEATURE_TABLE_GMM { bool FtrDesktop : 1; bool FtrChannelSwizzlingXOREnabled : 1; - bool FtrGtBigDie : 1; - bool FtrGtMediumDie : 1; - bool FtrGtSmallDie : 1; - - bool FtrGT1 : 1; - bool FtrGT1_5 : 1; - bool FtrGT2 : 1; - bool FtrGT2_5 : 1; - bool FtrGT3 : 1; - bool FtrGT4 : 1; - bool FtrIVBM0M1Platform : 1; bool FtrSGTPVSKUStrapPresent : 1; - bool FtrGTA : 1; - bool FtrGTC : 1; - bool FtrGTX : 1; bool Ftr5Slice : 1; bool FtrGpGpuMidBatchPreempt : 1; diff --git a/shared/source/sku_info/operations/windows/sku_info_receiver.h b/shared/source/sku_info/operations/windows/sku_info_receiver.h index 70a6c64a58..9c99c00689 100644 --- a/shared/source/sku_info/operations/windows/sku_info_receiver.h +++ b/shared/source/sku_info/operations/windows/sku_info_receiver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,22 +23,8 @@ class SkuInfoReceiver { RECEIVE_FTR(Desktop); RECEIVE_FTR(ChannelSwizzlingXOREnabled); - RECEIVE_FTR(GtBigDie); - RECEIVE_FTR(GtMediumDie); - RECEIVE_FTR(GtSmallDie); - - RECEIVE_FTR(GT1); - RECEIVE_FTR(GT1_5); - RECEIVE_FTR(GT2); - RECEIVE_FTR(GT2_5); - RECEIVE_FTR(GT3); - RECEIVE_FTR(GT4); - RECEIVE_FTR(IVBM0M1Platform); RECEIVE_FTR(SGTPVSKUStrapPresent); - RECEIVE_FTR(GTA); - RECEIVE_FTR(GTC); - RECEIVE_FTR(GTX); RECEIVE_FTR(5Slice); RECEIVE_FTR(GpGpuMidBatchPreempt); diff --git a/shared/source/sku_info/sku_info_base.h b/shared/source/sku_info/sku_info_base.h index c6fb0c1294..c9153d5514 100644 --- a/shared/source/sku_info/sku_info_base.h +++ b/shared/source/sku_info/sku_info_base.h @@ -25,20 +25,8 @@ struct FeatureTableBase { // DW0 uint32_t ftrDesktop : 1; uint32_t ftrChannelSwizzlingXOREnabled : 1; - uint32_t ftrGtBigDie : 1; - uint32_t ftrGtMediumDie : 1; - uint32_t ftrGtSmallDie : 1; - uint32_t ftrGT1 : 1; - uint32_t ftrGT1_5 : 1; - uint32_t ftrGT2 : 1; - uint32_t ftrGT2_5 : 1; - uint32_t ftrGT3 : 1; - uint32_t ftrGT4 : 1; uint32_t ftrIVBM0M1Platform : 1; uint32_t ftrSGTPVSKUStrapPresent : 1; - uint32_t ftrGTA : 1; - uint32_t ftrGTC : 1; - uint32_t ftrGTX : 1; uint32_t ftr5Slice : 1; uint32_t ftrGpGpuMidBatchPreempt : 1; uint32_t ftrGpGpuThreadGroupLevelPreempt : 1; @@ -55,7 +43,6 @@ struct FeatureTableBase { uint32_t ftr3dMidBatchPreempt : 1; uint32_t ftr3dObjectLevelPreempt : 1; uint32_t ftrPerCtxtPreemptionGranularityControl : 1; - // DW1 uint32_t ftrTileY : 1; uint32_t ftrDisplayYTiling : 1; uint32_t ftrTranslationTable : 1; @@ -68,6 +55,7 @@ struct FeatureTableBase { uint32_t ftrVcs2 : 1; uint32_t ftrVEBOX : 1; uint32_t ftrSingleVeboxSlice : 1; + // DW1 uint32_t ftrULT : 1; uint32_t ftrLCIA : 1; uint32_t ftrGttCacheInvalidation : 1; @@ -88,7 +76,6 @@ struct FeatureTableBase { uint32_t ftrSimulationMode : 1; uint32_t ftrE2ECompression : 1; uint32_t ftrLinearCCS : 1; - //DW2 uint32_t ftrCCSRing : 1; uint32_t ftrCCSNode : 1; uint32_t ftrRcsNode : 1; @@ -100,14 +87,13 @@ struct FeatureTableBase { uint32_t ftrPpgtt64KBWalkOptimization : 1; uint32_t ftrUnified3DMediaCompressionFormats : 1; uint32_t ftr57bGPUAddressing : 1; - uint32_t reserved : 21; }; BcsInfoMask ftrBcsInfo = 1; union { Flags flags; - std::array packed = {}; + std::array packed = {}; }; }; 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 13270f3f65..52ee2894a4 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 @@ -1739,33 +1739,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2: { dst.FtrVcs2 = readTokValue(*tok); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_BIG_DIE: { - dst.FtrGtBigDie = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_MEDIUM_DIE: { - dst.FtrGtMediumDie = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_SMALL_DIE: { - dst.FtrGtSmallDie = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1: { - dst.FtrGT1 = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1_5: { - dst.FtrGT1_5 = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2: { - dst.FtrGT2 = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2_5: { - dst.FtrGT2_5 = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT3: { - dst.FtrGT3 = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT4: { - dst.FtrGT4 = readTokValue(*tok); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT: { dst.FtrULT = readTokValue(*tok); } break; @@ -1775,15 +1748,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED: { dst.FtrChannelSwizzlingXOREnabled = readTokValue(*tok); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTA: { - dst.FtrGTA = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTC: { - dst.FtrGTC = readTokValue(*tok); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTX: { - dst.FtrGTX = readTokValue(*tok); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR5SLICE: { dst.Ftr5Slice = readTokValue(*tok); } break; @@ -2997,33 +2961,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2: { dst.SkuTable.FtrVcs2 = readTokValue(*tokSkuTable); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_BIG_DIE: { - dst.SkuTable.FtrGtBigDie = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_MEDIUM_DIE: { - dst.SkuTable.FtrGtMediumDie = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_SMALL_DIE: { - dst.SkuTable.FtrGtSmallDie = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1: { - dst.SkuTable.FtrGT1 = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1_5: { - dst.SkuTable.FtrGT1_5 = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2: { - dst.SkuTable.FtrGT2 = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2_5: { - dst.SkuTable.FtrGT2_5 = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT3: { - dst.SkuTable.FtrGT3 = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT4: { - dst.SkuTable.FtrGT4 = readTokValue(*tokSkuTable); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT: { dst.SkuTable.FtrULT = readTokValue(*tokSkuTable); } break; @@ -3033,15 +2970,6 @@ struct Demarshaller { case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED: { dst.SkuTable.FtrChannelSwizzlingXOREnabled = readTokValue(*tokSkuTable); } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTA: { - dst.SkuTable.FtrGTA = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTC: { - dst.SkuTable.FtrGTC = readTokValue(*tokSkuTable); - } break; - case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTX: { - dst.SkuTable.FtrGTX = readTokValue(*tokSkuTable); - } break; case TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR5SLICE: { dst.SkuTable.Ftr5Slice = readTokValue(*tokSkuTable); } break; diff --git a/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h b/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h index 8527ef4f6a..047f505617 100644 --- a/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h +++ b/shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h @@ -1060,21 +1060,10 @@ inline void marshall(TOKSTR__SKU_FEATURE_TABLE &dst, const _SKU_FEATURE_TABLET & dst.FtrDesktop.setValue(src.FtrDesktop); dst.FtrVERing.setValue(src.FtrVERing); dst.FtrVcs2.setValue(src.FtrVcs2); - dst.FtrGtBigDie.setValue(src.FtrGtBigDie); - dst.FtrGtMediumDie.setValue(src.FtrGtMediumDie); - dst.FtrGtSmallDie.setValue(src.FtrGtSmallDie); - dst.FtrGT1.setValue(src.FtrGT1); - dst.FtrGT1_5.setValue(src.FtrGT1_5); - dst.FtrGT2.setValue(src.FtrGT2); - dst.FtrGT2_5.setValue(src.FtrGT2_5); - dst.FtrGT3.setValue(src.FtrGT3); - dst.FtrGT4.setValue(src.FtrGT4); dst.FtrULT.setValue(src.FtrULT); dst.FtrIVBM0M1Platform.setValue(src.FtrIVBM0M1Platform); dst.FtrChannelSwizzlingXOREnabled.setValue(src.FtrChannelSwizzlingXOREnabled); - dst.FtrGTA.setValue(src.FtrGTA); - dst.FtrGTC.setValue(src.FtrGTC); - dst.FtrGTX.setValue(src.FtrGTX); + dst.Ftr5Slice.setValue(src.Ftr5Slice); dst.FtrLCIA.setValue(src.FtrLCIA); dst.FtrResourceStreamer.setValue(src.FtrResourceStreamer); @@ -1414,21 +1403,9 @@ inline void marshall(TOKSTR__ADAPTER_INFO &dst, const _ADAPTER_INFOT &src) { dst.SkuTable.FtrDesktop.setValue(src.SkuTable.FtrDesktop); dst.SkuTable.FtrVERing.setValue(src.SkuTable.FtrVERing); dst.SkuTable.FtrVcs2.setValue(src.SkuTable.FtrVcs2); - dst.SkuTable.FtrGtBigDie.setValue(src.SkuTable.FtrGtBigDie); - dst.SkuTable.FtrGtMediumDie.setValue(src.SkuTable.FtrGtMediumDie); - dst.SkuTable.FtrGtSmallDie.setValue(src.SkuTable.FtrGtSmallDie); - dst.SkuTable.FtrGT1.setValue(src.SkuTable.FtrGT1); - dst.SkuTable.FtrGT1_5.setValue(src.SkuTable.FtrGT1_5); - dst.SkuTable.FtrGT2.setValue(src.SkuTable.FtrGT2); - dst.SkuTable.FtrGT2_5.setValue(src.SkuTable.FtrGT2_5); - dst.SkuTable.FtrGT3.setValue(src.SkuTable.FtrGT3); - dst.SkuTable.FtrGT4.setValue(src.SkuTable.FtrGT4); dst.SkuTable.FtrULT.setValue(src.SkuTable.FtrULT); dst.SkuTable.FtrIVBM0M1Platform.setValue(src.SkuTable.FtrIVBM0M1Platform); dst.SkuTable.FtrChannelSwizzlingXOREnabled.setValue(src.SkuTable.FtrChannelSwizzlingXOREnabled); - dst.SkuTable.FtrGTA.setValue(src.SkuTable.FtrGTA); - dst.SkuTable.FtrGTC.setValue(src.SkuTable.FtrGTC); - dst.SkuTable.FtrGTX.setValue(src.SkuTable.FtrGTX); dst.SkuTable.Ftr5Slice.setValue(src.SkuTable.Ftr5Slice); dst.SkuTable.FtrLCIA.setValue(src.SkuTable.FtrLCIA); dst.SkuTable.FtrResourceStreamer.setValue(src.SkuTable.FtrResourceStreamer); 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 cfead6047f..dddef2cc5f 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 @@ -424,21 +424,9 @@ enum TOK : uint32_t { TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP = 381, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING = 395, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2 = 398, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_BIG_DIE = 401, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_MEDIUM_DIE = 402, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_SMALL_DIE = 403, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1 = 404, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1_5 = 406, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2 = 409, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2_5 = 411, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT3 = 412, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT4 = 414, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT = 423, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM = 425, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED = 434, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTA = 439, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTC = 440, - TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTX = 441, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR5SLICE = 442, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_LCIA = 445, TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_RESOURCE_STREAMER = 450, 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 a6e747ceec..24e6f8f927 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 @@ -449,21 +449,9 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrDesktop = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP}; TokenDword FtrVERing = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING}; TokenDword FtrVcs2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2}; - TokenDword FtrGtBigDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_BIG_DIE}; - TokenDword FtrGtMediumDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_MEDIUM_DIE}; - TokenDword FtrGtSmallDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_SMALL_DIE}; - TokenDword FtrGT1 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1}; - TokenDword FtrGT1_5 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1_5}; - TokenDword FtrGT2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2}; - TokenDword FtrGT2_5 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2_5}; - TokenDword FtrGT3 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT3}; - TokenDword FtrGT4 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT4}; TokenDword FtrULT = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT}; TokenDword FtrIVBM0M1Platform = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM}; TokenDword FtrChannelSwizzlingXOREnabled = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED}; - TokenDword FtrGTA = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTA}; - TokenDword FtrGTC = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTC}; - TokenDword FtrGTX = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTX}; TokenDword Ftr5Slice = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR5SLICE}; TokenDword FtrLCIA = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_LCIA}; TokenDword FtrResourceStreamer = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_RESOURCE_STREAMER}; @@ -666,21 +654,9 @@ struct TOKSTR__SKU_FEATURE_TABLE { TokenDword FtrDesktop = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_DESKTOP}; // Indirect field from anonymous struct TokenDword FtrVERing = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VERING}; // Indirect field from anonymous struct TokenDword FtrVcs2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_VCS2}; // Indirect field from anonymous struct - TokenDword FtrGtBigDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_BIG_DIE}; // Indirect field from anonymous struct - TokenDword FtrGtMediumDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_MEDIUM_DIE}; // Indirect field from anonymous struct - TokenDword FtrGtSmallDie = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT_SMALL_DIE}; // Indirect field from anonymous struct - TokenDword FtrGT1 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1}; // Indirect field from anonymous struct - TokenDword FtrGT1_5 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT1_5}; // Indirect field from anonymous struct - TokenDword FtrGT2 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2}; // Indirect field from anonymous struct - TokenDword FtrGT2_5 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT2_5}; // Indirect field from anonymous struct - TokenDword FtrGT3 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT3}; // Indirect field from anonymous struct - TokenDword FtrGT4 = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GT4}; // Indirect field from anonymous struct TokenDword FtrULT = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_ULT}; // Indirect field from anonymous struct TokenDword FtrIVBM0M1Platform = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_IVBM0M1PLATFORM}; // Indirect field from anonymous struct TokenDword FtrChannelSwizzlingXOREnabled = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_CHANNEL_SWIZZLING_XORENABLED}; // Indirect field from anonymous struct - TokenDword FtrGTA = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTA}; // Indirect field from anonymous struct - TokenDword FtrGTC = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTC}; // Indirect field from anonymous struct - TokenDword FtrGTX = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_GTX}; // Indirect field from anonymous struct TokenDword Ftr5Slice = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR5SLICE}; // Indirect field from anonymous struct TokenDword FtrLCIA = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_LCIA}; // Indirect field from anonymous struct TokenDword FtrResourceStreamer = {TOK_FBD_SKU_FEATURE_TABLE__ANONYMOUS3245__FTR_RESOURCE_STREAMER}; // Indirect field from anonymous struct