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

fix: Properly signal/wait on OpaqueWin32 Ext Semaphores

Browse Source 
Related-To: NEO-11488

Signed-off-by: Raiyan Latif <raiyan.latif@intel.com>
This commit is contained in:
Raiyan Latif
2025-01-24 18:10:33 +00:00
committed by Compute-Runtime-Automation
parent 8bbba3fe5c
commit fcb584299f
2 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
shared/source/os_interface/windows/external_semaphore_windows.cpp
View File

@@ -18,15 +18,6 @@
typedef VOID(NTAPI *_RtlInitUnicodeString)(PUNICODE_STRING destinationString, PCWSTR sourceString);
typedef VOID(NTAPI *_NtOpenDirectoryObject)(PHANDLE directoryHandle, ACCESS_MASK desiredAccess, POBJECT_ATTRIBUTES objectAttributes);
typedef wchar_t SharedSyncName[9 + 2 * (sizeof(uint32_t) + sizeof(uint64_t))];
struct SharedMemoryContentHeader {
alignas(8) uint64_t lastSignaledValue;
SharedSyncName sharedSyncName;
uint32_t access;
uint32_t serializedSecurityDescriptorStringSize;
};
namespace NEO {
std::unique_ptr<ExternalSemaphore> ExternalSemaphore::create(OSInterface *osInterface, ExternalSemaphore::Type type, void *handle, int fd) {
@@ -85,11 +76,12 @@ bool ExternalSemaphoreWindows::importSemaphore(void *extHandle, int fd, uint32_t
InitializeObjectAttributes(&objectAttributesRootDirectory, pUnicodeNameRootDirectory, 0, nullptr, nullptr);
ntOpenDirectoryObject(&rootDirectory, 0x0004 /* DIRECTORY_CREATE_OBJECT */, &objectAttributesRootDirectory);
auto pCpuAddress = MapViewOfFile(syncNtHandle, FILE_MAP_WRITE | FILE_MAP_READ, 0, 0, 0);
this->pCpuAddress = MapViewOfFile(syncNtHandle, FILE_MAP_WRITE | FILE_MAP_READ, 0, 0, 0);
auto sharedMemoryContentHeader = *reinterpret_cast<SharedMemoryContentHeader *>(pCpuAddress);
auto access = sharedMemoryContentHeader.access;
auto pSyncName = &sharedMemoryContentHeader.sharedSyncName[0];
auto sharedMemoryContentHeader = this->getSharedMemoryContentHeader();
auto access = sharedMemoryContentHeader->access;
auto pSyncName = &sharedMemoryContentHeader->sharedSyncName[0];
this->pLastSignaledValue = &sharedMemoryContentHeader->lastSignaledValue;
syncNtHandle = nullptr;
OBJECT_ATTRIBUTES objectAttributes;
@@ -141,6 +133,15 @@ bool ExternalSemaphoreWindows::enqueueWait(uint64_t *fenceValue) {
wait.hDevice = wddm->getDeviceHandle();
wait.ObjectCount = 1;
wait.ObjectHandleArray = &this->syncHandle;
uint64_t lastSignaledValue = 0;
if (this->type == ExternalSemaphore::OpaqueWin32) {
lastSignaledValue = *this->pLastSignaledValue;
wait.FenceValueArray = &lastSignaledValue;
} else {
wait.FenceValueArray = fenceValue;
}
wait.FenceValueArray = fenceValue;
wait.hAsyncEvent = nullptr;
wait.Flags = waitFlags;
@@ -162,13 +163,23 @@ bool ExternalSemaphoreWindows::enqueueSignal(uint64_t *fenceValue) {
signal.hDevice = wddm->getDeviceHandle();
signal.ObjectCount = 1;
signal.ObjectHandleArray = &this->syncHandle;
signal.FenceValueArray = fenceValue;
uint64_t lastSignaledValue = 0;
if (this->type == ExternalSemaphore::OpaqueWin32) {
lastSignaledValue = *this->pLastSignaledValue + 2;
signal.FenceValueArray = &lastSignaledValue;
} else {
signal.FenceValueArray = fenceValue;
}
auto status = wddm->getGdi()->signalSynchronizationObjectFromCpu(&signal);
if (status != STATUS_SUCCESS) {
return false;
}
if (this->type == ExternalSemaphore::OpaqueWin32) {
*this->pLastSignaledValue += 2;
}
this->state = SemaphoreState::Signaled;
return true;

15
shared/source/os_interface/windows/external_semaphore_windows.h
View File

@@ -20,6 +20,15 @@
namespace NEO {
typedef wchar_t SharedSyncName[9 + 2 * (sizeof(uint32_t) + sizeof(uint64_t))];
struct SharedMemoryContentHeader {
alignas(8) uint64_t lastSignaledValue;
SharedSyncName sharedSyncName;
uint32_t access;
uint32_t serializedSecurityDescriptorStringSize;
};
class ExternalSemaphoreWindows : public ExternalSemaphore {
public:
static std::unique_ptr<ExternalSemaphoreWindows> create(OSInterface *osInterface);
@@ -31,8 +40,14 @@ class ExternalSemaphoreWindows : public ExternalSemaphore {
bool enqueueWait(uint64_t *fenceValue) override;
bool enqueueSignal(uint64_t *fenceValue) override;
SharedMemoryContentHeader *getSharedMemoryContentHeader() {
return reinterpret_cast<SharedMemoryContentHeader *>(this->pCpuAddress);
}
protected:
D3DKMT_HANDLE syncHandle;
void *pCpuAddress = nullptr;
volatile uint64_t *pLastSignaledValue = nullptr;
};
} // namespace NEO