intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove not needed hardcoded values in xe path

Browse Source 
Related-To: NEO-10496
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-03-26 16:51:39 +00:00
committed by Compute-Runtime-Automation
parent 0b57b0fb7a
commit 5b6dd87fc3
3 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
View File

@@ -583,13 +583,13 @@ CacheRegion IoctlHelperXe::closFree(CacheRegion closIndex) {
return CacheRegion::none;
}
int IoctlHelperXe::xeWaitUserFence(uint32_t ctxId, uint64_t mask, uint16_t op, uint64_t addr, uint64_t value,
int IoctlHelperXe::xeWaitUserFence(uint32_t ctxId, uint16_t op, uint64_t addr, uint64_t value,
int64_t timeout) {
struct drm_xe_wait_user_fence wait = {};
wait.addr = addr;
wait.op = op;
wait.value = value;
wait.mask = mask;
wait.mask = std::numeric_limits<uint64_t>::max();
wait.timeout = timeout;
wait.exec_queue_id = ctxId;
auto retVal = IoctlHelper::ioctl(DrmIoctl::gemWaitUserFence, &wait);
@@ -601,27 +601,13 @@ int IoctlHelperXe::xeWaitUserFence(uint32_t ctxId, uint64_t mask, uint16_t op, u
int IoctlHelperXe::waitUserFence(uint32_t ctxId, uint64_t address,
uint64_t value, uint32_t dataWidth, int64_t timeout, uint16_t flags) {
xeLog(" -> IoctlHelperXe::%s a=0x%llx v=0x%llx w=0x%x T=0x%llx F=0x%x ctx=0x%x\n", __FUNCTION__, address, value, dataWidth, timeout, flags, ctxId);
uint64_t mask;
switch (dataWidth) {
case static_cast<uint32_t>(Drm::ValueWidth::u64):
mask = DRM_XE_UFENCE_WAIT_MASK_U64;
break;
case static_cast<uint32_t>(Drm::ValueWidth::u32):
mask = DRM_XE_UFENCE_WAIT_MASK_U32;
break;
case static_cast<uint32_t>(Drm::ValueWidth::u16):
mask = DRM_XE_UFENCE_WAIT_MASK_U16;
break;
default:
mask = DRM_XE_UFENCE_WAIT_MASK_U8;
break;
}
UNRECOVERABLE_IF(dataWidth != static_cast<uint32_t>(Drm::ValueWidth::u64));
if (timeout == -1) {
/* expected in i915 but not in xe where timeout is an unsigned long */
timeout = TimeoutControls::maxTimeout;
}
if (address) {
return xeWaitUserFence(ctxId, mask, DRM_XE_UFENCE_WAIT_OP_GTE, address, value, timeout);
return xeWaitUserFence(ctxId, DRM_XE_UFENCE_WAIT_OP_GTE, address, value, timeout);
}
return 0;
}
@@ -1270,7 +1256,7 @@ int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {
return ret;
}
return xeWaitUserFence(bind.exec_queue_id, DRM_XE_UFENCE_WAIT_MASK_U64, DRM_XE_UFENCE_WAIT_OP_EQ,
return xeWaitUserFence(bind.exec_queue_id, DRM_XE_UFENCE_WAIT_OP_EQ,
sync[0].addr,
sync[0].timeline_value, XE_ONE_SEC);
}

7
shared/source/os_interface/linux/xe/ioctl_helper_xe.h
View File

@@ -26,11 +26,6 @@ struct drm_xe_engine_class_instance;
#define XE_ONE_SEC 1000000000
#define DRM_XE_UFENCE_WAIT_MASK_U8 0xffu
#define DRM_XE_UFENCE_WAIT_MASK_U16 0xffffu
#define DRM_XE_UFENCE_WAIT_MASK_U32 0xffffffffu
#define DRM_XE_UFENCE_WAIT_MASK_U64 0xffffffffffffffffu
namespace NEO {
enum class EngineClass : uint16_t;
@@ -151,7 +146,7 @@ class IoctlHelperXe : public IoctlHelper {
const char *xeGetengineClassName(uint32_t engineClass);
template <typename DataType>
std::vector<DataType> queryData(uint32_t queryId);
int xeWaitUserFence(uint32_t ctxId, uint64_t mask, uint16_t op, uint64_t addr, uint64_t value, int64_t timeout);
int xeWaitUserFence(uint32_t ctxId, uint16_t op, uint64_t addr, uint64_t value, int64_t timeout);
int xeVmBind(const VmBindParams &vmBindParams, bool bindOp);
void xeShowBindTable();
void updateBindInfo(uint32_t handle, uint64_t userPtr, uint64_t size);

7
shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
View File

@@ -243,8 +243,6 @@ TEST(IoctlHelperXeTest, givenIoctlHelperXeWhenCallingAnyMethodThenDummyValueIsRe
EXPECT_EQ(CacheRegion::none, xeIoctlHelper->closFree(CacheRegion::none));
EXPECT_EQ(0, xeIoctlHelper->waitUserFence(0, 0, 0, 0, 0, 0));
EXPECT_EQ(0u, xeIoctlHelper->getAtomicAdvise(false));
EXPECT_EQ(0u, xeIoctlHelper->getAtomicAccess(AtomicAccessMode::none));
@@ -1417,6 +1415,7 @@ TEST(IoctlHelperXeTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
EXPECT_EQ(1u, drm.vmBindInputs.size());
EXPECT_EQ(1u, drm.syncInputs.size());
EXPECT_EQ(1u, drm.waitUserFenceInputs.size());
auto expectedMask = std::numeric_limits<uint64_t>::max();
{
auto &sync = drm.syncInputs[0];
@@ -1429,7 +1428,7 @@ TEST(IoctlHelperXeTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_EQ), waitUserFence.op);
EXPECT_EQ(0u, waitUserFence.flags);
EXPECT_EQ(fenceValue, waitUserFence.value);
EXPECT_EQ(static_cast<uint64_t>(DRM_XE_UFENCE_WAIT_MASK_U64), waitUserFence.mask);
EXPECT_EQ(expectedMask, waitUserFence.mask);
EXPECT_EQ(static_cast<int64_t>(XE_ONE_SEC), waitUserFence.timeout);
EXPECT_EQ(0u, waitUserFence.exec_queue_id);
}
@@ -1452,7 +1451,7 @@ TEST(IoctlHelperXeTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_EQ), waitUserFence.op);
EXPECT_EQ(0u, waitUserFence.flags);
EXPECT_EQ(fenceValue, waitUserFence.value);
EXPECT_EQ(static_cast<uint64_t>(DRM_XE_UFENCE_WAIT_MASK_U64), waitUserFence.mask);
EXPECT_EQ(expectedMask, waitUserFence.mask);
EXPECT_EQ(static_cast<int64_t>(XE_ONE_SEC), waitUserFence.timeout);
EXPECT_EQ(0u, waitUserFence.exec_queue_id);
}