intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 12:23:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup headers

Browse Source 
Related-To: NEO-5548
Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>
This commit is contained in:
Jaroslaw Warchulski
2025-06-20 09:23:25 +00:00
committed by Compute-Runtime-Automation
parent f2b5126598
commit 2375ff89bb
19 changed files with 65 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/source/direct_submission/windows/direct_submission_controller_windows.cpp
View File

@@ -11,6 +11,7 @@
#include "shared/source/os_interface/windows/sys_calls_winmm.h"
#include <chrono>
namespace NEO {
bool DirectSubmissionController::sleep(std::unique_lock<std::mutex> &lock) {
SysCalls::timeBeginPeriod(1u);
@@ -20,7 +21,11 @@ bool DirectSubmissionController::sleep(std::unique_lock<std::mutex> &lock) {
}
void DirectSubmissionController::overrideDirectSubmissionTimeouts(const ProductHelper &productHelper) {
productHelper.overrideDirectSubmissionTimeouts(this->timeout, this->maxTimeout);
uint64_t timeoutUs = this->timeout.count();
uint64_t maxTimeoutUs = this->maxTimeout.count();
productHelper.overrideDirectSubmissionTimeouts(timeoutUs, maxTimeoutUs);
this->timeout = std::chrono::microseconds(timeoutUs);
this->maxTimeout = std::chrono::microseconds(maxTimeoutUs);
}
} // namespace NEO

1
shared/source/os_interface/linux/drm_neo.cpp
View File

@@ -66,6 +66,7 @@ Drm::Drm(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceIdIn, RootDeviceEnvironment &r
hwDeviceId(std::move(hwDeviceIdIn)), rootDeviceEnvironment(rootDeviceEnvironment) {
pagingFence.fill(0u);
fenceVal.fill(0u);
minimalChunkingSize = MemoryConstants::pageSize2M;
}
SubmissionStatus Drm::getSubmissionStatusFromReturnCode(int32_t retCode) {

7
shared/source/os_interface/linux/drm_neo.h
View File

@@ -7,16 +7,12 @@
#pragma once
#include "shared/source/gmm_helper/gmm_lib.h"
#include "shared/source/helpers/constants.h"
#include "shared/source/helpers/driver_model_type.h"
#include "shared/source/memory_manager/definitions/engine_limits.h"
#include "shared/source/os_interface/linux/drm_debug.h"
#include "shared/source/os_interface/linux/drm_wrappers.h"
#include "shared/source/os_interface/linux/hw_device_id.h"
#include "shared/source/os_interface/os_interface.h"
#include "shared/source/utilities/stackvec.h"
#include "neo_igfxfmid.h"
#include <array>
#include <atomic>
@@ -275,6 +271,7 @@ class Drm : public DriverModel {
uint32_t getVmIdForContext(OsContext &osContext, uint32_t vmHandleId) const;
protected:
Drm() = delete;
Drm(std::unique_ptr<HwDeviceIdDrm> &&hwDeviceIdIn, RootDeviceEnvironment &rootDeviceEnvironment);
int waitOnUserFencesImpl(const OsContextLinux &osContext, uint64_t address, uint64_t value, uint32_t numActiveTiles, int64_t timeout, uint32_t postSyncOffset, bool userInterrupt,
@@ -358,7 +355,7 @@ class Drm : public DriverModel {
bool setPairAvailable = false;
bool chunkingAvailable = false;
uint32_t chunkingMode = 0;
uint32_t minimalChunkingSize = MemoryConstants::pageSize2M;
uint32_t minimalChunkingSize;
bool contextDebugSupported = false;
bool pageFaultSupported = false;
bool completionFenceSupported = false;

4
shared/source/os_interface/product_helper.h
View File

@@ -6,12 +6,10 @@
*/
#pragma once
#include "shared/source/command_stream/queue_throttle.h"
#include "shared/source/command_stream/task_count_helper.h"
#include "aubstream/engine_node.h"
#include <chrono>
#include <igfxfmid.h>
#include <memory>
#include <optional>
@@ -260,7 +258,7 @@ class ProductHelper {
virtual uint32_t getGmmResourceUsageOverride(uint32_t usageType) const = 0;
virtual bool isSharingWith3dOrMediaAllowed() const = 0;
virtual bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const = 0;
virtual void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const = 0;
virtual void overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const = 0;
virtual bool isMisalignedUserPtr2WayCoherent() const = 0;
virtual bool isSvmHeapReservationSupported() const = 0;
virtual void setRenderCompressedFlags(HardwareInfo &hwInfo) const = 0;

2
shared/source/os_interface/product_helper_before_xe2.inl
View File

@@ -67,7 +67,7 @@ bool ProductHelperHw<gfxProduct>::isPidFdOrSocketForIpcSupported() const {
}
template <PRODUCT_FAMILY gfxProduct>
void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const {
}
} // namespace NEO

2
shared/source/os_interface/product_helper_hw.h
View File

@@ -198,7 +198,7 @@ class ProductHelperHw : public ProductHelper {
uint32_t getGmmResourceUsageOverride(uint32_t usageType) const override;
bool isSharingWith3dOrMediaAllowed() const override;
bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const override;
void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const override;
void overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const override;
bool isMisalignedUserPtr2WayCoherent() const override;
bool isSvmHeapReservationSupported() const override;
void setRenderCompressedFlags(HardwareInfo &hwInfo) const override;

11
shared/source/os_interface/product_helper_xe2_and_later.inl
View File

@@ -6,6 +6,7 @@
*/
#include "shared/source/os_interface/product_helper_hw.h"
namespace NEO {
template <PRODUCT_FAMILY gfxProduct>
@@ -70,14 +71,14 @@ bool ProductHelperHw<gfxProduct>::isPidFdOrSocketForIpcSupported() const {
}
template <PRODUCT_FAMILY gfxProduct>
void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
timeout = std::chrono::microseconds{1'000};
maxTimeout = std::chrono::microseconds{1'000};
void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(uint64_t &timeoutUs, uint64_t &maxTimeoutUs) const {
timeoutUs = 1'000;
maxTimeoutUs = 1'000;
if (debugManager.flags.DirectSubmissionControllerTimeout.get() != -1) {
timeout = std::chrono::microseconds{debugManager.flags.DirectSubmissionControllerTimeout.get()};
timeoutUs = debugManager.flags.DirectSubmissionControllerTimeout.get();
}
if (debugManager.flags.DirectSubmissionControllerMaxTimeout.get() != -1) {
maxTimeout = std::chrono::microseconds{debugManager.flags.DirectSubmissionControllerMaxTimeout.get()};
maxTimeoutUs = debugManager.flags.DirectSubmissionControllerMaxTimeout.get();
}
}

4
shared/source/os_interface/windows/wddm_allocation.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2024 Intel Corporation
* Copyright (C) 2018-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -12,6 +12,8 @@
#include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
#include "shared/source/os_interface/windows/windows_wrapper.h"
#include <sstream>
namespace NEO {
struct OsHandleWin : OsHandle {

1
shared/source/utilities/bitcontainers.h
View File

@@ -14,6 +14,7 @@
#include <algorithm>
#include <bit>
#include <bitset>
#include <functional>
#include <vector>
// Variable-length bitarray with support for ffz (find first zero)