diff --git a/shared/source/aub_mem_dump/aub_mem_dump.h b/shared/source/aub_mem_dump/aub_mem_dump.h index 2d01889fc6..62ae17c6c7 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump.h +++ b/shared/source/aub_mem_dump/aub_mem_dump.h @@ -52,7 +52,6 @@ union MiGttEntry { }; // Use the latest DeviceValues enumerations available -typedef CmdServicesMemTraceVersion::DeviceValues DeviceValues; typedef CmdServicesMemTraceVersion::SteppingValues SteppingValues; typedef CmdServicesMemTraceMemoryWrite::AddressSpaceValues AddressSpaceValues; typedef CmdServicesMemTraceMemoryWrite::DataTypeHintValues DataTypeHintValues; diff --git a/shared/source/aub_mem_dump/definitions/aub_services.h b/shared/source/aub_mem_dump/definitions/aub_services.h index 0b2965018a..6a0ac8307b 100644 --- a/shared/source/aub_mem_dump/definitions/aub_services.h +++ b/shared/source/aub_mem_dump/definitions/aub_services.h @@ -76,22 +76,6 @@ struct CmdServicesMemTraceVersion { Ghal3DUlt = 2, AubDump = 4 }; }; - struct DeviceValues { - enum { - Tgllp = 22, - Dg1 = 30, - Adls = 37, - Adlp = 34, - Adln = 34, - Dg2 = 36, - Pvc = 39, - Mtl = 42, - Bmg = 43, - Lnl = 45, - Arl = 46, - Ptl = 51, - }; - }; struct RecordingMethodValues { enum { Phy = 1, Gfx = 0 }; diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw.h b/shared/source/command_stream/aub_command_stream_receiver_hw.h index e778be60a9..affdbea05f 100644 --- a/shared/source/command_stream/aub_command_stream_receiver_hw.h +++ b/shared/source/command_stream/aub_command_stream_receiver_hw.h @@ -83,7 +83,6 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw subCaptureManager; - uint32_t aubDeviceId; bool standalone; std::unique_ptr::type> ppgtt; diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl index c8c4188676..96f3837043 100644 --- a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -76,10 +76,6 @@ AUBCommandStreamReceiverHw::AUBCommandStreamReceiverHw(const std::str this->dispatchMode = (DispatchMode)debugManager.flags.CsrDispatchMode.get(); } - auto debugDeviceId = debugManager.flags.OverrideAubDeviceId.get(); - this->aubDeviceId = debugDeviceId == -1 - ? this->peekHwInfo().capabilityTable.aubDeviceId - : static_cast(debugDeviceId); this->defaultSshSize = 64 * MemoryConstants::kiloByte; } diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.h b/shared/source/command_stream/tbx_command_stream_receiver_hw.h index 0341708104..8836824825 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver_hw.h +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.h @@ -93,7 +93,6 @@ class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw subCaptureManager; - uint32_t aubDeviceId; bool streamInitialized = false; std::unique_ptr physicalAddressAllocator; diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl index 70df725198..8b77737138 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -61,10 +61,6 @@ TbxCommandStreamReceiverHw::TbxCommandStreamReceiverHw(ExecutionEnvir ppgtt = std::make_unique::type>(physicalAddressAllocator.get()); ggtt = std::make_unique(physicalAddressAllocator.get()); - auto debugDeviceId = debugManager.flags.OverrideAubDeviceId.get(); - this->aubDeviceId = debugDeviceId == -1 - ? this->peekHwInfo().capabilityTable.aubDeviceId - : static_cast(debugDeviceId); this->downloadAllocationImpl = [this](GraphicsAllocation &graphicsAllocation) { this->downloadAllocationTbx(graphicsAllocation); }; diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index f9127f8e32..b74f9e2454 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -636,7 +636,6 @@ DECLARE_DEBUG_VARIABLE(int32_t, ForcePreemptionMode, -1, "Keep this variable in DECLARE_DEBUG_VARIABLE(int32_t, ForceKernelPreemptionMode, -1, "Keep this variable in sync with PreemptionMode enum. -1 - kernel default mode, 1 - disable, 2 - midBatch, 3 - threadGroup, 4 - midThread") DECLARE_DEBUG_VARIABLE(int32_t, NodeOrdinal, -1, "-1: default do not override, 0: ENGINE_RCS") DECLARE_DEBUG_VARIABLE(int32_t, OverrideThreadArbitrationPolicy, -1, "-1 (don't override) or any valid config (0: Age Based, 1: Round Robin)") -DECLARE_DEBUG_VARIABLE(int32_t, OverrideAubDeviceId, -1, "-1 don't override, any other: use this value for AUB generation device id") DECLARE_DEBUG_VARIABLE(int32_t, EnableTimestampPacket, -1, "-1: default, 0: disable, 1:enable. Write Timestamp Packet for each set of gpu walkers") DECLARE_DEBUG_VARIABLE(int32_t, AllocateSharedAllocationsWithCpuAndGpuStorage, -1, "When enabled driver creates cpu & gpu storage for shared unified memory allocations. (-1 - devices default mode, 0 - disable, 1 - enable)") DECLARE_DEBUG_VARIABLE(int32_t, UseKmdMigration, -1, "-1: devices default mode, 0: disable - pagefault handling by UMD using handler for SIGSEGV, 1: enable - pagefault handling by KMD, GEM objects migrated by KMD upon access)") diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index 32f3fd1cf1..c75a8e55a7 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -33,43 +33,42 @@ const PLATFORM ADLN::platform = { const RuntimeCapabilityTable ADLN::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max64BitAppAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adln, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(ADLN::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - true, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - false, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max64BitAppAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(ADLN::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + true, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + false, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable ADLN::workaroundTable = {}; diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 4b04264689..1c65c0de6c 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -33,43 +33,42 @@ const PLATFORM ADLP::platform = { const RuntimeCapabilityTable ADLP::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max64BitAppAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adlp, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(ADLP::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - true, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - false, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max64BitAppAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(ADLP::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + true, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + false, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable ADLP::workaroundTable = {}; diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 03afbb12a5..37c1fc24bf 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -33,43 +33,42 @@ const PLATFORM ADLS::platform = { const RuntimeCapabilityTable ADLS::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max64BitAppAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adls, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(ADLS::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - true, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - false, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max64BitAppAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(ADLS::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + true, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + false, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable ADLS::workaroundTable = {}; diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 7eb3d00036..538f95d597 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -33,43 +33,42 @@ const PLATFORM DG1::platform = { const RuntimeCapabilityTable DG1::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max64BitAppAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Dg1, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(DG1::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - true, // supportCacheFlushAfterWalker - true, // supportsImages, - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - false, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - true, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max64BitAppAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(DG1::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + true, // supportCacheFlushAfterWalker + true, // supportsImages, + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + false, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + true, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable DG1::workaroundTable = {}; diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index f12d13cfa7..b77f99f5fc 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -33,43 +33,42 @@ const PLATFORM RKL::platform = { const RuntimeCapabilityTable RKL::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max48BitAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(RKL::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - true, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - false, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max48BitAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(RKL::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + true, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + false, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable RKL::workaroundTable = {}; diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index 5561592e36..438b11e8ec 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -33,43 +33,42 @@ const PLATFORM TGLLP::platform = { const RuntimeCapabilityTable TGLLP::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_RCS, {true, true}}, - {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max64BitAppAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::ThreadGroup, // defaultPreemptionMode - aub_stream::ENGINE_RCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId - 1, // extraQuantityThreadsPerEU - 64, // maxProgrammableSlmSize - sizeof(TGLLP::GRF), // grfSize - 36u, // timestampValidBits - 32u, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - false, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - false, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - false, // supportsOnDemandPageFaults - false, // supportsIndependentForwardProgress - true, // isIntegratedDevice - true, // supportsMediaBlock - true, // fusedEuEnabled - false, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max64BitAppAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::ThreadGroup, // defaultPreemptionMode + aub_stream::ENGINE_RCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 1, // extraQuantityThreadsPerEU + 64, // maxProgrammableSlmSize + sizeof(TGLLP::GRF), // grfSize + 36u, // timestampValidBits + 32u, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + false, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + false, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + false, // supportsOnDemandPageFaults + false, // supportsIndependentForwardProgress + true, // isIntegratedDevice + true, // supportsMediaBlock + true, // fusedEuEnabled + false, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; WorkaroundTable TGLLP::workaroundTable = {}; diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h index 9a44333a06..ead4b09f4b 100644 --- a/shared/source/helpers/hw_info.h +++ b/shared/source/helpers/hw_info.h @@ -31,7 +31,6 @@ struct RuntimeCapabilityTable { aub_stream::EngineType defaultEngineType; uint32_t maxRenderFrequency; unsigned int clVersionSupport; - uint32_t aubDeviceId; uint32_t extraQuantityThreadsPerEU; uint32_t maxProgrammableSlmSize; uint32_t grfSize; diff --git a/shared/source/xe2_hpg_core/hw_info_bmg.cpp b/shared/source/xe2_hpg_core/hw_info_bmg.cpp index 8ba961e31a..8a112cbce3 100644 --- a/shared/source/xe2_hpg_core/hw_info_bmg.cpp +++ b/shared/source/xe2_hpg_core/hw_info_bmg.cpp @@ -36,43 +36,42 @@ const RuntimeCapabilityTable BMG::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_CCS, {true, false, false, true}}, {aub_stream::ENGINE_CCS1, {true, false, true, true}}, - {aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max48BitAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode - aub_stream::ENGINE_CCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Bmg, // aubDeviceId - 0, // extraQuantityThreadsPerEU - 128, // maxProgrammableSlmSize - sizeof(BMG::GRF), // grfSize - 64, // timestampValidBits - 64, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - true, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - true, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - true, // supportsOnDemandPageFaults - true, // supportsIndependentForwardProgress - false, // isIntegratedDevice - false, // supportsMediaBlock - false, // fusedEuEnabled - true, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max48BitAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::MidThread, // defaultPreemptionMode + aub_stream::ENGINE_CCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 0, // extraQuantityThreadsPerEU + 128, // maxProgrammableSlmSize + sizeof(BMG::GRF), // grfSize + 64, // timestampValidBits + 64, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + true, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + true, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + true, // supportsOnDemandPageFaults + true, // supportsIndependentForwardProgress + false, // isIntegratedDevice + false, // supportsMediaBlock + false, // fusedEuEnabled + true, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) { diff --git a/shared/source/xe2_hpg_core/hw_info_lnl.cpp b/shared/source/xe2_hpg_core/hw_info_lnl.cpp index 742618506a..fafff8df30 100644 --- a/shared/source/xe2_hpg_core/hw_info_lnl.cpp +++ b/shared/source/xe2_hpg_core/hw_info_lnl.cpp @@ -45,7 +45,6 @@ const RuntimeCapabilityTable LNL::capabilityTable{ aub_stream::ENGINE_CCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Lnl, // aubDeviceId 0, // extraQuantityThreadsPerEU 128, // maxProgrammableSlmSize sizeof(LNL::GRF), // grfSize diff --git a/shared/source/xe3_core/hw_info_ptl.cpp b/shared/source/xe3_core/hw_info_ptl.cpp index 497d857754..66aaed512a 100644 --- a/shared/source/xe3_core/hw_info_ptl.cpp +++ b/shared/source/xe3_core/hw_info_ptl.cpp @@ -35,43 +35,42 @@ const PLATFORM PTL::platform = { const RuntimeCapabilityTable PTL::capabilityTable{ EngineDirectSubmissionInitVec{ {aub_stream::ENGINE_CCS, {true, false, false, true}}, - {aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines - {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties - MemoryConstants::max48BitAddress, // gpuAddressSpace - 0, // sharedSystemMemCapabilities - MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "", // deviceName - nullptr, // preferredPlatformName - PreemptionMode::MidThread, // defaultPreemptionMode - aub_stream::ENGINE_CCS, // defaultEngineType - 0, // maxRenderFrequency - 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Ptl, // aubDeviceId - 0, // extraQuantityThreadsPerEU - 128, // maxProgrammableSlmSize - sizeof(PTL::GRF), // grfSize - 64, // timestampValidBits - 64, // kernelTimestampValidBits - false, // blitterOperationsSupported - true, // ftrSupportsInteger64BitAtomics - true, // ftrSupportsFP64 - false, // ftrSupportsFP64Emulation - true, // ftrSupports64BitMath - false, // ftrSupportsCoherency - false, // ftrRenderCompressedBuffers - false, // ftrRenderCompressedImages - true, // instrumentationEnabled - false, // supportCacheFlushAfterWalker - true, // supportsImages - true, // supportsOcl21Features - true, // supportsOnDemandPageFaults - true, // supportsIndependentForwardProgress - true, // isIntegratedDevice - false, // supportsMediaBlock - false, // fusedEuEnabled - true, // l0DebuggerSupported; - true, // supportsFloatAtomics - 0 // cxlType + {aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines + {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties + MemoryConstants::max48BitAddress, // gpuAddressSpace + 0, // sharedSystemMemCapabilities + MemoryConstants::pageSize, // requiredPreemptionSurfaceSize + "", // deviceName + nullptr, // preferredPlatformName + PreemptionMode::MidThread, // defaultPreemptionMode + aub_stream::ENGINE_CCS, // defaultEngineType + 0, // maxRenderFrequency + 30, // clVersionSupport + 0, // extraQuantityThreadsPerEU + 128, // maxProgrammableSlmSize + sizeof(PTL::GRF), // grfSize + 64, // timestampValidBits + 64, // kernelTimestampValidBits + false, // blitterOperationsSupported + true, // ftrSupportsInteger64BitAtomics + true, // ftrSupportsFP64 + false, // ftrSupportsFP64Emulation + true, // ftrSupports64BitMath + false, // ftrSupportsCoherency + false, // ftrRenderCompressedBuffers + false, // ftrRenderCompressedImages + true, // instrumentationEnabled + false, // supportCacheFlushAfterWalker + true, // supportsImages + true, // supportsOcl21Features + true, // supportsOnDemandPageFaults + true, // supportsIndependentForwardProgress + true, // isIntegratedDevice + false, // supportsMediaBlock + false, // fusedEuEnabled + true, // l0DebuggerSupported; + true, // supportsFloatAtomics + 0 // cxlType }; void PTL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) { diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 2acc3b617c..bee51b2d55 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -57,7 +57,6 @@ const RuntimeCapabilityTable PVC::capabilityTable{ aub_stream::ENGINE_CCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Pvc, // aubDeviceId 0, // extraQuantityThreadsPerEU 128, // maxProgrammableSlmSize sizeof(PVC::GRF), // grfSize diff --git a/shared/source/xe_hpg_core/hw_info_arl.cpp b/shared/source/xe_hpg_core/hw_info_arl.cpp index 494da66c07..a5208dc576 100644 --- a/shared/source/xe_hpg_core/hw_info_arl.cpp +++ b/shared/source/xe_hpg_core/hw_info_arl.cpp @@ -42,7 +42,6 @@ const RuntimeCapabilityTable ARL::capabilityTable{ aub_stream::ENGINE_CCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Arl, // aubDeviceId 0, // extraQuantityThreadsPerEU 64, // maxProgrammableSlmSize sizeof(ARL::GRF), // grfSize diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index 082e9e6c17..772c953c46 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -47,7 +47,6 @@ const RuntimeCapabilityTable DG2::capabilityTable{ aub_stream::ENGINE_CCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Dg2, // aubDeviceId 0, // extraQuantityThreadsPerEU 64, // maxProgrammableSlmSize sizeof(DG2::GRF), // grfSize diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp index af045f006a..e07a182224 100644 --- a/shared/source/xe_hpg_core/hw_info_mtl.cpp +++ b/shared/source/xe_hpg_core/hw_info_mtl.cpp @@ -43,7 +43,6 @@ const RuntimeCapabilityTable MTL::capabilityTable{ aub_stream::ENGINE_CCS, // defaultEngineType 0, // maxRenderFrequency 30, // clVersionSupport - AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Mtl, // aubDeviceId 0, // extraQuantityThreadsPerEU 64, // maxProgrammableSlmSize sizeof(MTL::GRF), // grfSize diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index 0d520fb2ac..8524219259 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -201,7 +201,6 @@ UsmInitialPlacement = -1 ForceKernelPreemptionMode = -1 NodeOrdinal = -1 OverrideThreadArbitrationPolicy = -1 -OverrideAubDeviceId = -1 EnableTimestampPacket = -1 AllocateSharedAllocationsWithCpuAndGpuStorage = -1 UseMaxSimdSizeToDeduceMaxWorkgroupSize = 0 diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 48a2bf1a76..b833dee0d2 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -605,18 +605,6 @@ HWTEST_F(AubCommandStreamReceiverNoHostPtrTests, givenAubCommandStreamReceiverWh memoryManager->freeGraphicsMemory(gfxAllocation); } -HWTEST_F(AubCommandStreamReceiverTests, givenNoDbgDeviceIdFlagWhenAubCsrIsCreatedThenUseDefaultDeviceId) { - std::unique_ptr> aubCsr(new MockAubCsr("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); - EXPECT_EQ(pDevice->getHardwareInfo().capabilityTable.aubDeviceId, aubCsr->aubDeviceId); -} - -HWTEST_F(AubCommandStreamReceiverTests, givenDbgDeviceIdFlagIsSetWhenAubCsrIsCreatedThenUseDebugDeviceId) { - DebugManagerStateRestore stateRestore; - debugManager.flags.OverrideAubDeviceId.set(9); // this is Hsw, not used - std::unique_ptr> aubCsr(new MockAubCsr("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); - EXPECT_EQ(9u, aubCsr->aubDeviceId); -} - HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGetGTTDataIsCalledThenLocalMemoryIsSetAccordingToCsrFeature) { std::unique_ptr> aubCsr(new MockAubCsr("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); AubGTTData data = {}; @@ -817,4 +805,4 @@ HWTEST_F(AubCommandStreamReceiverTests, givenTimestampBufferAllocationWhenAubWri EXPECT_FALSE(timestampAllocation->isAubWritable(GraphicsAllocation::defaultBank)); memoryManager->freeGraphicsMemory(timestampAllocation); -} \ No newline at end of file +} diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index c436d3623f..69b01e5267 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -325,19 +325,6 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledTh memoryManager->freeGraphicsMemory(commandBuffer); } -HWTEST_F(TbxCommandStreamTests, givenNoDbgDeviceIdFlagWhenTbxCsrIsCreatedThenUseDefaultDeviceId) { - const HardwareInfo &hwInfo = *defaultHwInfo; - TbxCommandStreamReceiverHw *tbxCsr = reinterpret_cast *>(pCommandStreamReceiver); - EXPECT_EQ(hwInfo.capabilityTable.aubDeviceId, tbxCsr->aubDeviceId); -} - -HWTEST_F(TbxCommandStreamTests, givenDbgDeviceIdFlagIsSetWhenTbxCsrIsCreatedThenUseDebugDeviceId) { - DebugManagerStateRestore stateRestore; - debugManager.flags.OverrideAubDeviceId.set(9); // this is Hsw, not used - std::unique_ptr> tbxCsr(reinterpret_cast *>(TbxCommandStreamReceiver::create("", false, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()))); - EXPECT_EQ(9u, tbxCsr->aubDeviceId); -} - HWTEST_F(TbxCommandSteamSimpleTest, givenTbxCsrWhenCallingMakeSurfacePackNonResidentThenOnlyResidentAllocationsAddedAllocationsForDownload) { MockTbxCsr tbxCsr{*pDevice->executionEnvironment, pDevice->getDeviceBitfield()}; MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(pDevice->getDeviceBitfield()));