diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp index 7edcaf4014..b4014b2af1 100644 --- a/opencl/source/api/api.cpp +++ b/opencl/source/api/api.cpp @@ -4801,10 +4801,6 @@ void *CL_API_CALL clSVMAlloc(cl_context context, } const HardwareInfo &hwInfo = pDevice->getHardwareInfo(); - if (!hwInfo.capabilityTable.ftrSvm) { - TRACING_EXIT(ClSvmAlloc, &pAlloc); - return pAlloc; - } if (flags & CL_MEM_SVM_FINE_GRAIN_BUFFER) { bool supportsFineGrained = hwInfo.capabilityTable.ftrSupportsCoherency; @@ -4841,12 +4837,6 @@ void CL_API_CALL clSVMFree(cl_context context, return; } - auto pClDevice = pContext->getDevice(0); - if (!pClDevice->getHardwareInfo().capabilityTable.ftrSvm) { - TRACING_EXIT(ClSvmFree, nullptr); - return; - } - pContext->getSVMAllocsManager()->freeSVMAlloc(svmPointer); TRACING_EXIT(ClSvmFree, nullptr); } @@ -4886,13 +4876,6 @@ cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue, return retVal; } - auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmFree, &retVal); - return retVal; - } - if (((svmPointers != nullptr) && (numSvmPointers == 0)) || ((svmPointers == nullptr) && (numSvmPointers != 0))) { retVal = CL_INVALID_VALUE; @@ -4946,11 +4929,6 @@ cl_int CL_API_CALL clEnqueueSVMMemcpy(cl_command_queue commandQueue, } auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal); - return retVal; - } if ((dstPtr == nullptr) || (srcPtr == nullptr)) { retVal = CL_INVALID_VALUE; @@ -5017,13 +4995,6 @@ cl_int CL_API_CALL clEnqueueSVMMemFill(cl_command_queue commandQueue, return retVal; } - auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmMemFill, &retVal); - return retVal; - } - if ((svmPtr == nullptr) || (size == 0)) { retVal = CL_INVALID_VALUE; TRACING_EXIT(ClEnqueueSvmMemFill, &retVal); @@ -5079,13 +5050,6 @@ cl_int CL_API_CALL clEnqueueSVMMap(cl_command_queue commandQueue, return retVal; } - auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmMap, &retVal); - return retVal; - } - if ((svmPtr == nullptr) || (size == 0)) { retVal = CL_INVALID_VALUE; TRACING_EXIT(ClEnqueueSvmMap, &retVal); @@ -5139,13 +5103,6 @@ cl_int CL_API_CALL clEnqueueSVMUnmap(cl_command_queue commandQueue, return retVal; } - auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmUnmap, &retVal); - return retVal; - } - if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_MAP_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) { retVal = CL_INVALID_OPERATION; TRACING_EXIT(ClEnqueueSvmUnmap, &retVal); @@ -5216,15 +5173,6 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel, DBG_LOG_INPUTS("kernel", kernel, "argIndex", argIndex, "argValue", argValue); - for (const auto &pDevice : multiDeviceKernel->getDevices()) { - const HardwareInfo &hwInfo = pDevice->getHardwareInfo(); - if (!hwInfo.capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal); - return retVal; - } - } - for (const auto &pDevice : multiDeviceKernel->getDevices()) { auto pKernel = multiDeviceKernel->getKernel(pDevice->getRootDeviceIndex()); cl_int kernelArgAddressQualifier = asClKernelArgAddressQualifier(pKernel->getKernelInfo() @@ -5279,23 +5227,6 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel, return retVal; } - switch (paramName) { - case CL_KERNEL_EXEC_INFO_SVM_PTRS: - case CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM: - case CL_KERNEL_EXEC_INFO_INDIRECT_DEVICE_ACCESS_INTEL: - case CL_KERNEL_EXEC_INFO_INDIRECT_HOST_ACCESS_INTEL: - case CL_KERNEL_EXEC_INFO_INDIRECT_SHARED_ACCESS_INTEL: - case CL_KERNEL_EXEC_INFO_USM_PTRS_INTEL: - for (const auto &pDevice : pMultiDeviceKernel->getDevices()) { - const HardwareInfo &hwInfo = pDevice->getHardwareInfo(); - if (!hwInfo.capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClSetKernelExecInfo, &retVal); - return retVal; - } - } - } - switch (paramName) { case CL_KERNEL_EXEC_INFO_INDIRECT_DEVICE_ACCESS_INTEL: case CL_KERNEL_EXEC_INFO_INDIRECT_HOST_ACCESS_INTEL: @@ -5845,13 +5776,6 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue, return retVal; } - auto &device = pCommandQueue->getDevice(); - if (!device.getHardwareInfo().capabilityTable.ftrSvm) { - retVal = CL_INVALID_OPERATION; - TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal); - return retVal; - } - if (numSvmPointers == 0 || svmPointers == nullptr) { retVal = CL_INVALID_VALUE; TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal); diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp index 618278a625..66040d0915 100644 --- a/opencl/source/cl_device/cl_device_caps.cpp +++ b/opencl/source/cl_device/cl_device_caps.cpp @@ -318,15 +318,13 @@ void ClDevice::initializeCaps() { deviceInfo.genericAddressSpaceSupport = ocl21FeaturesEnabled; deviceInfo.linkerAvailable = true; - deviceInfo.svmCapabilities = hwInfo.capabilityTable.ftrSvm * CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; - if (hwInfo.capabilityTable.ftrSvm) { - auto reportFineGrained = hwInfo.capabilityTable.ftrSvm * hwInfo.capabilityTable.ftrSupportsCoherency; - if (debugManager.flags.ForceFineGrainedSVMSupport.get() != -1) { - reportFineGrained = !!debugManager.flags.ForceFineGrainedSVMSupport.get(); - } - if (reportFineGrained) { - deviceInfo.svmCapabilities |= static_cast(CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS); - } + deviceInfo.svmCapabilities = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; + auto reportFineGrained = hwInfo.capabilityTable.ftrSupportsCoherency; + if (debugManager.flags.ForceFineGrainedSVMSupport.get() != -1) { + reportFineGrained = !!debugManager.flags.ForceFineGrainedSVMSupport.get(); + } + if (reportFineGrained) { + deviceInfo.svmCapabilities |= static_cast(CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS); } for (auto &engineGroup : this->getDevice().getRegularEngineGroups()) { diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp index cdf74e1868..dd28b3eb8c 100644 --- a/opencl/source/context/context.cpp +++ b/opencl/source/context/context.cpp @@ -296,20 +296,16 @@ bool Context::createImpl(const cl_context_properties *properties, memoryManager->getDeferredDeleter()->addClient(); } - bool anySvmSupport = false; for (auto &device : devices) { device->incRefInternal(); - anySvmSupport |= device->getHardwareInfo().capabilityTable.ftrSvm; } setupContextType(); - if (anySvmSupport) { - this->svmAllocsManager = new SVMAllocsManager(this->memoryManager, - this->areMultiStorageAllocationsPreferred()); - this->svmAllocsManager->initUsmAllocationsCaches(device->getDevice()); - auto requiresWritableStaging = device->getDefaultEngine().commandStreamReceiver->getType() != CommandStreamReceiverType::hardware; - this->stagingBufferManager = std::make_unique(svmAllocsManager, rootDeviceIndices, deviceBitfields, requiresWritableStaging); - } + this->svmAllocsManager = new SVMAllocsManager(this->memoryManager, + this->areMultiStorageAllocationsPreferred()); + this->svmAllocsManager->initUsmAllocationsCaches(device->getDevice()); + auto requiresWritableStaging = device->getDefaultEngine().commandStreamReceiver->getType() != CommandStreamReceiverType::hardware; + this->stagingBufferManager = std::make_unique(svmAllocsManager, rootDeviceIndices, deviceBitfields, requiresWritableStaging); smallBufferPoolAllocator.setParams(SmallBuffersParams::getPreferredBufferPoolParams(device->getProductHelper())); } diff --git a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp index 4c45157b95..9ea4ce4742 100644 --- a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp +++ b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp @@ -24,7 +24,6 @@ bool GTPinGfxCoreHelperHw::canUseSharedAllocation(const HardwareInfo if (debugManager.flags.GTPinAllocateBufferInSharedMemory.get() != -1) { canUseSharedAllocation = !!debugManager.flags.GTPinAllocateBufferInSharedMemory.get(); } - canUseSharedAllocation &= hwInfo.capabilityTable.ftrSvm; return canUseSharedAllocation; } diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl index 568c319d5b..2d27f81a97 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -145,26 +145,4 @@ TEST_F(ClEnqueueSVMFreeTests, GivenZeroNumOfSVMPointersAndNullSVMPointersWhenFre } } -TEST_F(ClEnqueueSVMFreeTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMFreeThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - auto retVal = clEnqueueSVMFree( - pCommandQueue.get(), // cl_command_queue command_queue - 0, // cl_uint num_svm_pointers - nullptr, // void *svm_pointers[] - nullptr, // (CL_CALLBACK *pfn_free_func) ( cl_command_queue queue, cl_uint num_svm_pointers, void *svm_pointers[]) - nullptr, // void *user_data - 0, // cl_uint num_events_in_wait_list - nullptr, // const cl_event *event_wait_list - nullptr // cl_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl index 3f01ec0e10..dbd1d79ec0 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -149,26 +149,4 @@ TEST_F(ClEnqueueSVMMapTests, GivenQueueIncapableWhenMappingSvmBufferThenInvalidO clSVMFree(pContext, ptrSvm); } -TEST_F(ClEnqueueSVMMapTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMapThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - auto retVal = clEnqueueSVMMap( - pCommandQueue.get(), // cl_command_queue command_queue - CL_FALSE, // cl_bool blocking_map - CL_MAP_READ, // cl_map_flags map_flags - nullptr, // void *svm_ptr - 256, // size_t size - 0, // cl_uint num_events_in_wait_list - nullptr, // const cL_event *event_wait_list - nullptr // cl_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl index 4d17c31d7f..8b33989216 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -149,26 +149,4 @@ TEST_F(ClEnqueueSVMMemFillTests, GivenQueueIncapableWhenFillingSvmBufferThenInva clSVMFree(pContext, ptrSvm); } -TEST_F(ClEnqueueSVMMemFillTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMemFillThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - auto retVal = clEnqueueSVMMemFill( - pCommandQueue.get(), // cl_command_queue command_queue - nullptr, // void *svm_ptr - nullptr, // const void *pattern - 0, // size_t pattern_size - 256, // size_t size - 0, // cl_uint num_events_in_wait_list - nullptr, // cl_evebt *event_wait_list - nullptr // cL_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl index 012201f143..5b09293264 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -209,28 +209,6 @@ TEST_F(ClEnqueueSVMMemcpyTests, GivenInvalidPtrAndZeroSizeWhenCopyingSVMMemoryTh } } -TEST_F(ClEnqueueSVMMemcpyTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMemcpyThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - auto retVal = clEnqueueSVMMemcpy( - pCommandQueue.get(), // cl_command_queue command_queue - CL_FALSE, // cl_bool blocking_copy - nullptr, // void *dst_ptr - nullptr, // const void *src_ptr - 0, // size_t size - 0, // cl_uint num_events_in_wait_list - nullptr, // const cl_event *event_wait_list - nullptr // cl_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - TEST_F(ClEnqueueSVMMemcpyTests, givenCopyValidForStagingBuffersCopyThenTransferSuccesfull) { DebugManagerStateRestore restorer; debugManager.flags.EnableCopyWithStagingBuffers.set(1); diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp index 5f92202bbc..2d56b6ba8f 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -306,26 +306,4 @@ TEST_F(ClEnqueueSVMMigrateMemTests, GivenSameContextCommandQueueAndEventsWhenMig } } -TEST_F(ClEnqueueSVMMigrateMemTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMigrateMemThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - auto retVal = clEnqueueSVMMigrateMem( - pCommandQueue.get(), // cl_command_queue command_queue - 1, // cl_uint num_svm_pointers - nullptr, // const void **svm_pointers - nullptr, // const size_t *sizes - 0, // const cl_mem_migration_flags flags - 0, // cl_uint num_events_in_wait_list - nullptr, // const cl_event *event_wait_list - nullptr // cl_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl index 5c00564ecd..a4d03b08b9 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -130,23 +130,4 @@ TEST_F(ClEnqueueSVMUnmapTests, GivenQueueIncapableWhenUnmappingSvmBufferThenInva clSVMFree(pContext, ptrSvm); } -TEST_F(ClEnqueueSVMUnmapTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMUnmapThenInvalidOperationErrorIsReturned) { - auto hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - - auto pDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - cl_device_id deviceId = pDevice.get(); - auto pContext = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - auto pCommandQueue = std::make_unique(pContext.get(), pDevice.get(), nullptr, false); - - retVal = clEnqueueSVMUnmap( - pCommandQueue.get(), // cl_command_queue command_queue - reinterpret_cast(0x1234), // void *svm_ptr - 0, // cl_uint num_events_in_wait_list - nullptr, // const cL_event *event_wait_list - nullptr // cl_event *event - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - } // namespace ULT diff --git a/opencl/test/unit_test/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl index ac3e70dc03..755724402e 100644 --- a/opencl/test/unit_test/api/cl_get_device_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -102,12 +102,10 @@ TEST_F(clGetDeviceInfoTests, givenOpenCLDeviceWhenAskedForSupportedSvmTypeThenCo const HardwareInfo &hwInfo = pDevice->getHardwareInfo(); cl_device_svm_capabilities expectedCaps = 0; - if (hwInfo.capabilityTable.ftrSvm != 0) { - if (hwInfo.capabilityTable.ftrSupportsCoherency != 0) { - expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER | CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS; - } else { - expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; - } + if (hwInfo.capabilityTable.ftrSupportsCoherency != 0) { + expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER | CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS; + } else { + expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; } EXPECT_EQ(svmCaps, expectedCaps); } @@ -167,10 +165,7 @@ TEST(clGetDeviceFineGrainedTests, givenDebugFlagForFineGrainedOverrideWhenItIsUs EXPECT_EQ(CL_SUCCESS, retVal); - cl_device_svm_capabilities expectedCaps = 0; - if (hwInfo.capabilityTable.ftrSvm != 0) { - expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; - } + cl_device_svm_capabilities expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER; EXPECT_EQ(svmCaps, expectedCaps); } @@ -192,10 +187,7 @@ TEST(clGetDeviceFineGrainedTests, givenDebugFlagForFineGrainedOverrideWhenItIsUs EXPECT_EQ(CL_SUCCESS, retVal); - cl_device_svm_capabilities expectedCaps = 0; - if (hwInfo.capabilityTable.ftrSvm != 0) { - expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER | CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS; - } + cl_device_svm_capabilities expectedCaps = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER | CL_DEVICE_SVM_FINE_GRAIN_BUFFER | CL_DEVICE_SVM_ATOMICS; EXPECT_EQ(svmCaps, expectedCaps); } diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index 8d32b48962..ec2c7937d0 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -80,23 +80,6 @@ TEST_F(clSetKernelArgSVMPointerTests, GivenInvalidArgIndexWhenSettingKernelArgTh EXPECT_EQ(CL_INVALID_ARG_INDEX, retVal); } -TEST_F(clSetKernelArgSVMPointerTests, GivenDeviceNotSupportingSvmWhenSettingKernelArgSVMPointerThenInvalidOperationErrorIsReturned) { - auto hwInfo = executionEnvironment->rootDeviceEnvironments[ApiFixture::testedRootDeviceIndex]->getMutableHardwareInfo(); - hwInfo->capabilityTable.ftrSvm = false; - - cl_int retVal{CL_SUCCESS}; - std::unique_ptr pMultiDeviceKernel( - MultiDeviceKernel::create(pProgram, MockKernel::toKernelInfoContainer(*pKernelInfo, testedRootDeviceIndex), retVal)); - ASSERT_EQ(CL_SUCCESS, retVal); - - retVal = clSetKernelArgSVMPointer( - pMultiDeviceKernel.get(), // cl_kernel kernel - 0, // cl_uint arg_index - nullptr // const void *arg_value - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); -} - TEST_F(clSetKernelArgSVMPointerTests, GivenLocalAddressAndNullArgValueWhenSettingKernelArgThenInvalidArgValueErrorIsReturned) { pKernelInfo->setAddressQualifier(0, KernelArgMetadata::AddrLocal); diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl index f8b22dc73f..9028a9fc36 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -69,45 +69,6 @@ TEST_F(clSetKernelExecInfoTests, GivenNullKernelWhenSettingAdditionalKernelInfoT EXPECT_EQ(CL_INVALID_KERNEL, retVal); } -TEST_F(clSetKernelExecInfoTests, GivenDeviceNotSupportingSvmWhenSettingKernelExecInfoThenErrorIsReturnedOnSvmRelatedParams) { - auto &clGfxCoreHelper = pDevice->getRootDeviceEnvironment().getHelper(); - if (!clGfxCoreHelper.isSupportedKernelThreadArbitrationPolicy()) { - GTEST_SKIP(); - } - auto hwInfo = executionEnvironment->rootDeviceEnvironments[ApiFixture::testedRootDeviceIndex]->getMutableHardwareInfo(); - VariableBackup ftrSvm{&hwInfo->capabilityTable.ftrSvm, false}; - - cl_int retVal{CL_SUCCESS}; - std::unique_ptr pMultiDeviceKernel(MultiDeviceKernel::create( - pProgram, MockKernel::toKernelInfoContainer(*pKernelInfo, testedRootDeviceIndex), retVal)); - ASSERT_EQ(CL_SUCCESS, retVal); - - uint32_t newPolicy = CL_KERNEL_EXEC_INFO_THREAD_ARBITRATION_POLICY_ROUND_ROBIN_INTEL; - retVal = clSetKernelExecInfo( - pMockMultiDeviceKernel, // cl_kernel kernel - CL_KERNEL_EXEC_INFO_THREAD_ARBITRATION_POLICY_INTEL, // cl_kernel_exec_info param_name - sizeof(newPolicy), // size_t param_value_size - &newPolicy // const void *param_value - ); - EXPECT_EQ(CL_SUCCESS, retVal); - - cl_kernel_exec_info svmParams[] = {CL_KERNEL_EXEC_INFO_SVM_PTRS, - CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM, - CL_KERNEL_EXEC_INFO_INDIRECT_DEVICE_ACCESS_INTEL, - CL_KERNEL_EXEC_INFO_INDIRECT_HOST_ACCESS_INTEL, - CL_KERNEL_EXEC_INFO_INDIRECT_DEVICE_ACCESS_INTEL, - CL_KERNEL_EXEC_INFO_INDIRECT_SHARED_ACCESS_INTEL}; - for (auto svmParam : svmParams) { - retVal = clSetKernelExecInfo( - pMockMultiDeviceKernel, // cl_kernel kernel - svmParam, // cl_kernel_exec_info param_name - 0, // size_t param_value_size - nullptr // const void *param_value - ); - EXPECT_EQ(CL_INVALID_OPERATION, retVal); - } -} - TEST_F(clSetKernelExecInfoTests, GivenNullParamValueWhenSettingAdditionalKernelInfoThenInvalidValueErrorIsReturned) { REQUIRE_SVM_OR_SKIP(defaultHwInfo); void **pSvmPtrList = nullptr; diff --git a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl index 31b1c376c1..3a2643657f 100644 --- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -125,15 +125,7 @@ TEST_P(ClSVMAllocFtrFlagsTests, GivenCorrectFlagsWhenAllocatingSvmThenSvmIsAlloc cl_mem_flags flags = GetParam(); void *svmPtr = nullptr; - // 1: no svm - no flags supported - pHwInfo->capabilityTable.ftrSvm = false; - pHwInfo->capabilityTable.ftrSupportsCoherency = false; - - svmPtr = clSVMAlloc(pContext, flags, 4096, 128); - EXPECT_EQ(nullptr, svmPtr); - - // 2: coarse svm - normal flags supported - pHwInfo->capabilityTable.ftrSvm = true; + // 1: coarse svm - normal flags supported svmPtr = clSVMAlloc(pContext, flags, 4096, 128); if (flags & CL_MEM_SVM_FINE_GRAIN_BUFFER) { // fg svm flags not supported @@ -144,7 +136,7 @@ TEST_P(ClSVMAllocFtrFlagsTests, GivenCorrectFlagsWhenAllocatingSvmThenSvmIsAlloc clSVMFree(pContext, svmPtr); } - // 3: fg svm - all flags supported + // 2: fg svm - all flags supported pHwInfo->capabilityTable.ftrSupportsCoherency = true; svmPtr = clSVMAlloc(pContext, flags, 4096, 128); EXPECT_NE(nullptr, svmPtr); @@ -264,7 +256,6 @@ TEST_F(ClSVMAllocTests, GivenForcedFineGrainedSvmWhenCreatingSvmAllocThenAllocat REQUIRE_SVM_OR_SKIP(pDevice); DebugManagerStateRestore restore{}; HardwareInfo *hwInfo = pDevice->getExecutionEnvironment()->rootDeviceEnvironments[testedRootDeviceIndex]->getMutableHardwareInfo(); - hwInfo->capabilityTable.ftrSvm = true; hwInfo->capabilityTable.ftrSupportsCoherency = false; auto allocation = clSVMAlloc(pContext, CL_MEM_READ_WRITE | CL_MEM_SVM_FINE_GRAIN_BUFFER, 4096 /* Size */, 0 /* alignment */); diff --git a/opencl/test/unit_test/api/cl_svm_free_tests.inl b/opencl/test/unit_test/api/cl_svm_free_tests.inl index 0292553215..5504ceaa96 100644 --- a/opencl/test/unit_test/api/cl_svm_free_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_free_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,18 +20,4 @@ TEST_F(ClSVMFreeTests, GivenNullPtrWhenFreeingSvmThenNoAction) { ); } -TEST_F(ClSVMFreeTests, GivenContextWithDeviceNotSupportingSvmWhenFreeingSvmThenNoAction) { - HardwareInfo hwInfo = *defaultHwInfo; - hwInfo.capabilityTable.ftrSvm = false; - auto clDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); - - cl_device_id deviceId = clDevice.get(); - auto context = clUniquePtr(Context::create(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal)); - EXPECT_EQ(retVal, CL_SUCCESS); - - clSVMFree( - context.get(), - reinterpret_cast(0x1234)); -} - } // namespace ULT diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index 1d7ab76f9f..8e1d2897e5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -863,9 +863,6 @@ struct ReadBufferStagingBufferTest : public EnqueueReadBufferHw { } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } EnqueueReadBufferHw::TearDown(); } constexpr static size_t chunkSize = MemoryConstants::megaByte * 2; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 0ff62d258a..cb22d3880c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -1077,10 +1077,6 @@ HWTEST_F(OneMipLevelReadImageTests, GivenNotMippedImageWhenReadingImageThenDoNot } HWTEST_F(EnqueueReadImageTest, whenEnqueueReadImageWithUsmPtrThenDontImportAllocation) { - bool svmSupported = pDevice->getHardwareInfo().capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } auto svmManager = pCmdQ->getContext().getSVMAllocsManager(); SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 4096, pCmdQ->getContext().getRootDeviceIndices(), pCmdQ->getContext().getDeviceBitfields()); @@ -1113,9 +1109,6 @@ struct ReadImageStagingBufferTest : public EnqueueReadImageTest { } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } delete[] ptr; EnqueueReadImageTest::TearDown(); } diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index 8420009ae0..9297e54761 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -54,9 +54,6 @@ struct EnqueueSvmTest : public ClDeviceFixture, } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } context->getSVMAllocsManager()->freeSVMAlloc(ptrSVM); CommandQueueFixture::tearDown(); ClDeviceFixture::tearDown(); @@ -1090,10 +1087,6 @@ HWTEST_F(EnqueueSvmTest, WhenMigratingMemoryThenSvmMigrateMemCommandTypeIsUsed) } TEST(CreateSvmAllocTests, givenVariousSvmAllocationPropertiesWhenAllocatingSvmThenSvmIsCorrectlyAllocated) { - if (!defaultHwInfo->capabilityTable.ftrSvm) { - return; - } - DebugManagerStateRestore dbgRestore; SVMAllocsManager::SvmAllocationProperties svmAllocationProperties; @@ -1131,9 +1124,6 @@ struct EnqueueSvmTestLocalMemory : public ClDeviceFixture, } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } context->getSVMAllocsManager()->freeSVMAlloc(svmPtr); context.reset(nullptr); ClDeviceFixture::tearDown(); @@ -2417,9 +2407,6 @@ struct StagingBufferTest : public EnqueueSvmTest { } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } svmManager = this->context->getSVMAllocsManager(); svmManager->freeSVMAlloc(dstPtr); delete[] srcPtr; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index ef401eb86c..86d0f1919f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -643,9 +643,6 @@ struct WriteBufferStagingBufferTest : public EnqueueWriteBufferHw { } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } EnqueueWriteBufferHw::TearDown(); } constexpr static size_t chunkSize = MemoryConstants::megaByte * 2; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index ae3cfc746e..19a6b42bce 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -758,10 +758,6 @@ HWTEST_F(EnqueueWriteImageTest, givenMultiRootDeviceImageWhenNonBlockedEnqueueWr } HWTEST_F(EnqueueWriteImageTest, whenEnqueueWriteImageWithUsmPtrThenDontImportAllocation) { - bool svmSupported = pDevice->getHardwareInfo().capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } auto svmManager = pCmdQ->getContext().getSVMAllocsManager(); SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 4096, pCmdQ->getContext().getRootDeviceIndices(), pCmdQ->getContext().getDeviceBitfields()); @@ -787,10 +783,6 @@ HWTEST_F(EnqueueWriteImageTest, whenEnqueueWriteImageWithUsmPtrThenDontImportAll } HWTEST_F(EnqueueWriteImageTest, whenEnqueueWriteImageWithUsmPtrAndSizeLowerThanRequiredThenFail) { - bool svmSupported = pDevice->getHardwareInfo().capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } auto svmManager = pCmdQ->getContext().getSVMAllocsManager(); SVMAllocsManager::UnifiedMemoryProperties unifiedMemoryProperties(InternalMemoryType::hostUnifiedMemory, 4096, pCmdQ->getContext().getRootDeviceIndices(), pCmdQ->getContext().getDeviceBitfields()); @@ -813,10 +805,6 @@ HWTEST_F(EnqueueWriteImageTest, whenEnqueueWriteImageWithUsmPtrAndSizeLowerThanR } HWTEST_F(EnqueueWriteImageTest, whenisValidForStagingTransferCalledThenReturnCorrectValue) { - bool svmSupported = pDevice->getHardwareInfo().capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } auto isStagingBuffersEnabled = pDevice->getProductHelper().isStagingBuffersEnabled(); unsigned char ptr[16]; @@ -841,9 +829,6 @@ struct WriteImageStagingBufferTest : public EnqueueWriteImageTest { } void TearDown() override { - if (defaultHwInfo->capabilityTable.ftrSvm == false) { - return; - } delete[] ptr; EnqueueWriteImageTest::TearDown(); } diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 3a0d550ad4..29aa7c8ac7 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -261,22 +261,6 @@ TEST_F(ContextTest, givenContextWhenSharingTableIsNotEmptyThenReturnsSharingFunc EXPECT_EQ(sharingF, sharingFunctions); } -TEST(Context, givenFtrSvmFalseWhenContextIsCreatedThenSVMAllocsManagerIsNotCreated) { - ExecutionEnvironment *executionEnvironment = platform()->peekExecutionEnvironment(); - executionEnvironment->prepareRootDeviceEnvironments(1u); - auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo(); - hwInfo->capabilityTable.ftrSvm = false; - - auto device = std::make_unique(MockDevice::createWithExecutionEnvironment(hwInfo, executionEnvironment, 0)); - - cl_device_id clDevice = device.get(); - cl_int retVal = CL_SUCCESS; - auto context = std::unique_ptr(Context::create(nullptr, ClDeviceVector(&clDevice, 1), nullptr, nullptr, retVal)); - ASSERT_NE(nullptr, context); - auto svmManager = context->getSVMAllocsManager(); - EXPECT_EQ(nullptr, svmManager); -} - TEST(Context, whenCreateContextThenSpecialQueueUsesInternalEngine) { auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); cl_device_id clDevice = device.get(); diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index bbf8072919..b4328ba1e9 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -2166,15 +2166,6 @@ class GTPinFixtureWithLocalMemory : public GTPinFixture { using GTPinTestsWithLocalMemory = Test; -TEST_F(GTPinTestsWithLocalMemory, whenPlatformHasNoSvmSupportThenGtPinBufferCantBeAllocatedInSharedMemory) { - debugManager.flags.GTPinAllocateBufferInSharedMemory.set(-1); - auto >pinHelper = pDevice->getGTPinGfxCoreHelper(); - auto canUseSharedAllocation = gtpinHelper.canUseSharedAllocation(pDevice->getHardwareInfo()); - if (!pDevice->getHardwareInfo().capabilityTable.ftrSvm) { - EXPECT_FALSE(canUseSharedAllocation); - } -} - HWTEST_F(GTPinTests, givenGtPinWithSupportForSharedAllocationWhenGtPinHelperFunctionsAreCalledThenCheckIfSharedAllocationCanBeUsed) { auto >pinHelper = pDevice->getGTPinGfxCoreHelper(); if (!gtpinHelper.canUseSharedAllocation(pDevice->getHardwareInfo())) { diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index 24b8ec0761..716ec67cfd 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -530,10 +530,6 @@ struct MemoryManagerPropertiesCheck : public MockMemoryManager { struct UnifiedMemoryManagerPropertiesTest : public ::testing::Test { void SetUp() override { - bool svmSupported = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } memoryManager = std::make_unique(false, true, executionEnvironment); svmManager = std::make_unique(memoryManager.get(), false); memoryManager->pageFaultManager.reset(new MockPageFaultManager); @@ -925,10 +921,6 @@ TEST_F(UnifiedMemoryManagerPropertiesTest, struct ShareableUnifiedMemoryManagerPropertiesTest : public ::testing::Test { void SetUp() override { executionEnvironment = platform()->peekExecutionEnvironment(); - bool svmSupported = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } memoryManager = std::make_unique(false, true, *executionEnvironment); svmManager = std::make_unique(memoryManager.get(), false); memoryManager->pageFaultManager.reset(new MockPageFaultManager); diff --git a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp index 1db14c2a52..dee77233db 100644 --- a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp +++ b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp @@ -22,10 +22,6 @@ using namespace NEO; -bool TestChecks::supportsSvm(const ClDevice *pClDevice) { - return supportsSvm(&pClDevice->getDevice()); -} - bool TestChecks::supportsImages(const Context *pContext) { return pContext->getDevice(0)->getSharedDeviceInfo().imageSupport; } diff --git a/opencl/test/unit_test/test_macros/test_checks_ocl.h b/opencl/test/unit_test/test_macros/test_checks_ocl.h index 5344540544..8c5a13fa82 100644 --- a/opencl/test/unit_test/test_macros/test_checks_ocl.h +++ b/opencl/test/unit_test/test_macros/test_checks_ocl.h @@ -16,7 +16,6 @@ struct HardwareInfo; struct RootDeviceEnvironment; namespace TestChecks { -bool supportsSvm(const ClDevice *pClDevice); bool supportsImages(const Context *pContext); bool supportsOcl21(const std::unique_ptr &pHardwareInfo); bool supportsAuxResolves(const RootDeviceEnvironment &rootDeviceEnvironment); diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index cf6a447002..d624236a5b 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable ADLN::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index f876b8d2be..f4666a348b 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable ADLP::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 8d4f17e170..6154e88d56 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable ADLS::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 3ce92f4735..4c8a12222b 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable DG1::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index 239c6d528c..90de5ef512 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable RKL::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index f27bc34170..f82bc77036 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -55,7 +55,6 @@ const RuntimeCapabilityTable TGLLP::capabilityTable{ false, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation false, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h index 9f35e13b1e..56885ec16a 100644 --- a/shared/source/helpers/hw_info.h +++ b/shared/source/helpers/hw_info.h @@ -42,7 +42,6 @@ struct RuntimeCapabilityTable { bool ftrSupportsFP64; bool ftrSupportsFP64Emulation; bool ftrSupports64BitMath; - bool ftrSvm; bool ftrSupportsCoherency; bool ftrRenderCompressedBuffers; bool ftrRenderCompressedImages; @@ -101,7 +100,6 @@ inline bool operator==(const RuntimeCapabilityTable &lhs, const RuntimeCapabilit result &= (lhs.ftrSupportsFP64 == rhs.ftrSupportsFP64); result &= (lhs.ftrSupportsFP64Emulation == rhs.ftrSupportsFP64Emulation); result &= (lhs.ftrSupports64BitMath == rhs.ftrSupports64BitMath); - result &= (lhs.ftrSvm == rhs.ftrSvm); result &= (lhs.ftrSupportsCoherency == rhs.ftrSupportsCoherency); result &= (lhs.ftrRenderCompressedBuffers == rhs.ftrRenderCompressedBuffers); result &= (lhs.ftrRenderCompressedImages == rhs.ftrRenderCompressedImages); diff --git a/shared/source/os_interface/linux/product_helper_drm.cpp b/shared/source/os_interface/linux/product_helper_drm.cpp index 8d90ff21e5..3e3943a51f 100644 --- a/shared/source/os_interface/linux/product_helper_drm.cpp +++ b/shared/source/os_interface/linux/product_helper_drm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -90,7 +90,6 @@ int ProductHelper::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo featureTable->flags.ftrEDram = (gtSystemInfo->EdramSizeInKb != 0) ? 1 : 0; outHwInfo->capabilityTable.maxRenderFrequency = maxGpuFreq; - outHwInfo->capabilityTable.ftrSvm = featureTable->flags.ftrSVM; outHwInfo->capabilityTable.ftrSupportsCoherency = false; setupDefaultEngineType(*outHwInfo, rootDeviceEnvironment); diff --git a/shared/source/os_interface/windows/product_helper_wddm.cpp b/shared/source/os_interface/windows/product_helper_wddm.cpp index 7ca9dbfc65..b627e8eac3 100644 --- a/shared/source/os_interface/windows/product_helper_wddm.cpp +++ b/shared/source/os_interface/windows/product_helper_wddm.cpp @@ -15,7 +15,6 @@ namespace NEO { int ProductHelper::configureHwInfoWddm(const HardwareInfo *inHwInfo, HardwareInfo *outHwInfo, const RootDeviceEnvironment &rootDeviceEnvironment) { - outHwInfo->capabilityTable.ftrSvm = outHwInfo->featureTable.flags.ftrSVM; this->setCapabilityCoherencyFlag(*outHwInfo, outHwInfo->capabilityTable.ftrSupportsCoherency); outHwInfo->capabilityTable.ftrSupportsCoherency &= inHwInfo->featureTable.flags.ftrL3IACoherency; diff --git a/shared/source/xe2_hpg_core/hw_info_bmg.cpp b/shared/source/xe2_hpg_core/hw_info_bmg.cpp index 65d815358b..9d39f5b493 100644 --- a/shared/source/xe2_hpg_core/hw_info_bmg.cpp +++ b/shared/source/xe2_hpg_core/hw_info_bmg.cpp @@ -58,7 +58,6 @@ const RuntimeCapabilityTable BMG::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe2_hpg_core/hw_info_lnl.cpp b/shared/source/xe2_hpg_core/hw_info_lnl.cpp index 48e8982b5e..6bd3df9832 100644 --- a/shared/source/xe2_hpg_core/hw_info_lnl.cpp +++ b/shared/source/xe2_hpg_core/hw_info_lnl.cpp @@ -56,7 +56,6 @@ const RuntimeCapabilityTable LNL::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe3_core/hw_info_ptl.cpp b/shared/source/xe3_core/hw_info_ptl.cpp index aeb01f4551..82d01ea040 100644 --- a/shared/source/xe3_core/hw_info_ptl.cpp +++ b/shared/source/xe3_core/hw_info_ptl.cpp @@ -56,7 +56,6 @@ const RuntimeCapabilityTable PTL::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 2f6c1361aa..e8b63c79c2 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -68,7 +68,6 @@ const RuntimeCapabilityTable PVC::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe_hpg_core/hw_info_arl.cpp b/shared/source/xe_hpg_core/hw_info_arl.cpp index fd13dbcca7..e7f4e001a3 100644 --- a/shared/source/xe_hpg_core/hw_info_arl.cpp +++ b/shared/source/xe_hpg_core/hw_info_arl.cpp @@ -53,7 +53,6 @@ const RuntimeCapabilityTable ARL::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index a3ee334072..239925d45c 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -58,7 +58,6 @@ const RuntimeCapabilityTable DG2::capabilityTable{ false, // ftrSupportsFP64 true, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp index 64ea790c90..9e469f79e9 100644 --- a/shared/source/xe_hpg_core/hw_info_mtl.cpp +++ b/shared/source/xe_hpg_core/hw_info_mtl.cpp @@ -54,7 +54,6 @@ const RuntimeCapabilityTable MTL::capabilityTable{ true, // ftrSupportsFP64 false, // ftrSupportsFP64Emulation true, // ftrSupports64BitMath - true, // ftrSvm false, // ftrSupportsCoherency false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedImages diff --git a/shared/test/common/mocks/mock_svm_manager.h b/shared/test/common/mocks/mock_svm_manager.h index e6f5c4cab3..057d46c2e8 100644 --- a/shared/test/common/mocks/mock_svm_manager.h +++ b/shared/test/common/mocks/mock_svm_manager.h @@ -43,10 +43,6 @@ struct SVMMemoryAllocatorFixture { SVMMemoryAllocatorFixture() : executionEnvironment(defaultHwInfo.get()) {} void setUp() { - bool svmSupported = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } executionEnvironment.initGmm(); memoryManager = std::make_unique(false, enableLocalMemory, executionEnvironment); svmManager = std::make_unique(memoryManager.get(), false); diff --git a/shared/test/common/test_macros/test_checks_shared.cpp b/shared/test/common/test_macros/test_checks_shared.cpp index 06b926bfdf..4d191bb82e 100644 --- a/shared/test/common/test_macros/test_checks_shared.cpp +++ b/shared/test/common/test_macros/test_checks_shared.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -45,14 +45,4 @@ bool TestChecks::supportsImages(const HardwareInfo &hardwareInfo) { bool TestChecks::supportsImages(const std::unique_ptr &pHardwareInfo) { return supportsImages(*pHardwareInfo); -} - -bool TestChecks::supportsSvm(const HardwareInfo *pHardwareInfo) { - return pHardwareInfo->capabilityTable.ftrSvm; -} -bool TestChecks::supportsSvm(const std::unique_ptr &pHardwareInfo) { - return supportsSvm(pHardwareInfo.get()); -} -bool TestChecks::supportsSvm(const Device *pDevice) { - return supportsSvm(&pDevice->getHardwareInfo()); -} +} \ No newline at end of file diff --git a/shared/test/common/test_macros/test_checks_shared.h b/shared/test/common/test_macros/test_checks_shared.h index c656088716..583ef5c993 100644 --- a/shared/test/common/test_macros/test_checks_shared.h +++ b/shared/test/common/test_macros/test_checks_shared.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,9 +20,6 @@ bool supportsBlitter(const RootDeviceEnvironment &rootDeviceEnvironment); bool fullySupportsBlitter(const RootDeviceEnvironment &rootDeviceEnvironment); bool supportsImages(const HardwareInfo &hardwareInfo); bool supportsImages(const std::unique_ptr &pHardwareInfo); -bool supportsSvm(const HardwareInfo *pHardwareInfo); -bool supportsSvm(const std::unique_ptr &pHardwareInfo); -bool supportsSvm(const Device *pDevice); } // namespace TestChecks } // namespace NEO @@ -37,10 +34,7 @@ bool supportsSvm(const Device *pDevice); GTEST_SKIP(); \ } -#define REQUIRE_SVM_OR_SKIP(param) \ - if (NEO::TestChecks::supportsSvm(param) == false) { \ - GTEST_SKIP(); \ - } +#define REQUIRE_SVM_OR_SKIP(param) (void)param #define REQUIRE_BLITTER_OR_SKIP(param) \ if (NEO::TestChecks::supportsBlitter(param) == false) { \ diff --git a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp index 6b7c04a853..5ad87c1b83 100644 --- a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp @@ -60,11 +60,6 @@ ADLNTEST_F(AdlnHwInfo, givenBoolWhenCallAdlnHardwareInfoSetupThenFeatureTableAnd } } -ADLNTEST_F(AdlnHwInfo, whenPlatformIsAdlnThenExpectSvmIsSet) { - const HardwareInfo &hardwareInfo = ADLN::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSvm); -} - using AdlnProductHelper = ProductHelperTest; ADLNTEST_F(AdlnProductHelper, whenGettingAubstreamProductFamilyThenProperEnumValueIsReturned) { diff --git a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp index 5c5f201bb8..f4778c4584 100644 --- a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp @@ -59,11 +59,6 @@ ADLPTEST_F(AdlpHwInfo, givenBoolWhenCallAdlpHardwareInfoSetupThenFeatureTableAnd } } -ADLPTEST_F(AdlpHwInfo, whenPlatformIsAdlpThenExpectSvmIsSet) { - const HardwareInfo &hardwareInfo = ADLP::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSvm); -} - using AdlpProductHelper = ProductHelperTest; ADLPTEST_F(AdlpProductHelper, whenGettingAubstreamProductFamilyThenProperEnumValueIsReturned) { diff --git a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp index e525ea4583..c178589941 100644 --- a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp +++ b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp @@ -59,11 +59,6 @@ ADLSTEST_F(AdlsHwInfo, givenBoolWhenCallAdlsHardwareInfoSetupThenFeatureTableAnd } } -ADLSTEST_F(AdlsHwInfo, whenPlatformIsAdlsThenExpectSvmIsSet) { - const HardwareInfo &hardwareInfo = ADLS::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSvm); -} - using AdlsProductHelper = ProductHelperTest; ADLSTEST_F(AdlsProductHelper, whenGettingAubstreamProductFamilyThenProperEnumValueIsReturned) { diff --git a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp index e8af2d7c33..e64715dbf0 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp @@ -72,11 +72,6 @@ DG1TEST_F(Dg1HwInfo, givenBoolWhenCallDg1HardwareInfoSetupThenFeatureTableAndWor } } -DG1TEST_F(Dg1HwInfo, whenPlatformIsDg1ThenExpectSvmIsSet) { - const HardwareInfo &hardwareInfo = DG1::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSvm); -} - using Dg1ProductHelper = ProductHelperTest; DG1TEST_F(Dg1ProductHelper, whenGettingAubstreamProductFamilyThenProperEnumValueIsReturned) { diff --git a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp index a1a6a3cd69..ded92b7c8b 100644 --- a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp @@ -64,11 +64,6 @@ RKLTEST_F(RklHwInfo, givenBoolWhenCallRklHardwareInfoSetupThenFeatureTableAndWor } } -RKLTEST_F(RklHwInfo, whenPlatformIsRklThenExpectSvmIsSet) { - const HardwareInfo &hardwareInfo = RKL::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSvm); -} - RKLTEST_F(RklHwInfo, givenRklWhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) { const HardwareInfo &hardwareInfo = RKL::hwInfo; EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSupportsInteger64BitAtomics); diff --git a/shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp b/shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp index 8cbdb73289..c158c2da6c 100644 --- a/shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp +++ b/shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp @@ -148,10 +148,6 @@ TEST(SvmAllocationCacheSimpleTest, givenAllocationsWhenCheckingIsInUseThenReturn struct SvmAllocationCacheTestFixture { SvmAllocationCacheTestFixture() : executionEnvironment(defaultHwInfo.get()) {} void setUp() { - bool svmSupported = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.ftrSvm; - if (!svmSupported) { - GTEST_SKIP(); - } } void tearDown() { } diff --git a/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp index da9c9ab781..2d22478ccb 100644 --- a/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/product_helper_linux_tests.cpp @@ -294,18 +294,6 @@ TEST_F(MockProductHelperTestLinux, givenInstrumentationForHardwareIsEnabledOrDis EXPECT_TRUE(outHwInfo.capabilityTable.instrumentationEnabled); } -TEST_F(MockProductHelperTestLinux, givenGttSizeReturnedWhenInitializingHwInfoThenSetSvmFtr) { - drm->storedGTTSize = MemoryConstants::max64BitAppAddress; - int ret = mockProductHelper->configureHwInfoDrm(&pInHwInfo, &outHwInfo, *executionEnvironment->rootDeviceEnvironments[0].get()); - EXPECT_EQ(0, ret); - EXPECT_FALSE(outHwInfo.capabilityTable.ftrSvm); - - drm->storedGTTSize = MemoryConstants::max64BitAppAddress + 1; - ret = mockProductHelper->configureHwInfoDrm(&pInHwInfo, &outHwInfo, *executionEnvironment->rootDeviceEnvironments[0].get()); - EXPECT_EQ(0, ret); - EXPECT_TRUE(outHwInfo.capabilityTable.ftrSvm); -} - TEST_F(MockProductHelperTestLinux, givenGttSizeReturnedWhenInitializingHwInfoThenSetGpuAddressSpace) { drm->storedGTTSize = maxNBitValue(40) + 1; int ret = mockProductHelper->configureHwInfoDrm(&pInHwInfo, &outHwInfo, *executionEnvironment->rootDeviceEnvironments[0].get()); @@ -318,7 +306,6 @@ TEST_F(MockProductHelperTestLinux, givenFailingGttSizeIoctlWhenInitializingHwInf int ret = mockProductHelper->configureHwInfoDrm(&pInHwInfo, &outHwInfo, *executionEnvironment->rootDeviceEnvironments[0].get()); EXPECT_EQ(0, ret); - EXPECT_TRUE(outHwInfo.capabilityTable.ftrSvm); EXPECT_NE(0u, outHwInfo.capabilityTable.gpuAddressSpace); EXPECT_EQ(pInHwInfo.capabilityTable.gpuAddressSpace, outHwInfo.capabilityTable.gpuAddressSpace); } diff --git a/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp index 4964ee7aac..701727056d 100644 --- a/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/product_helper_win_tests.cpp @@ -55,15 +55,6 @@ TEST_F(ProductHelperTestWindows, givenCorrectParametersWhenConfiguringHwInfoThen EXPECT_EQ(0, ret); } -TEST_F(ProductHelperTestWindows, givenCorrectParametersWhenConfiguringHwInfoThenSetFtrSvmCorrectly) { - auto ftrSvm = outHwInfo.featureTable.flags.ftrSVM; - - int ret = productHelper->configureHwInfoWddm(&pInHwInfo, &outHwInfo, *rootDeviceEnvironment.get()); - ASSERT_EQ(0, ret); - - EXPECT_EQ(outHwInfo.capabilityTable.ftrSvm, ftrSvm); -} - TEST_F(ProductHelperTestWindows, givenInstrumentationForHardwareIsEnabledOrDisabledWhenConfiguringHwInfoThenOverrideItUsingHaveInstrumentation) { int ret;