diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp index bbdf4a4513..4e64c58145 100644 --- a/level_zero/core/source/device/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -877,10 +877,7 @@ ze_result_t DeviceImp::getKernelProperties(ze_device_module_properties_t *pKerne return ZE_RESULT_ERROR_UNKNOWN; } - pKernelProperties->flags = ZE_DEVICE_MODULE_FLAG_FP16; - if (hardwareInfo.capabilityTable.ftrSupportsInteger64BitAtomics) { - pKernelProperties->flags |= ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS; - } + pKernelProperties->flags = ZE_DEVICE_MODULE_FLAG_FP16 | ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS; pKernelProperties->fp16flags = defaultFpFlags; pKernelProperties->fp32flags = defaultFpFlags; diff --git a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp index 522e387eb8..56d9b8743f 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp @@ -1166,8 +1166,6 @@ HWTEST_F(DeviceTest, givenSetMaxBVHLevelsWhenPassingRaytracingExpStructToGetProp } TEST_F(DeviceTest, givenKernelPropertiesStructureWhenKernelPropertiesCalledThenAllPropertiesAreAssigned) { - const auto &hardwareInfo = this->neoDevice->getHardwareInfo(); - ze_device_module_properties_t kernelProperties = {}; ze_device_module_properties_t kernelPropertiesBefore = {}; memset(&kernelProperties, std::numeric_limits::max(), sizeof(ze_device_module_properties_t)); @@ -1181,9 +1179,7 @@ TEST_F(DeviceTest, givenKernelPropertiesStructureWhenKernelPropertiesCalledThenA EXPECT_NE(nativeKernelSupportedIdPointerBefore, nativeKernelSupportedIdPointerNow); EXPECT_TRUE(kernelPropertiesBefore.flags & ZE_DEVICE_MODULE_FLAG_FP16); - if (hardwareInfo.capabilityTable.ftrSupportsInteger64BitAtomics) { - EXPECT_TRUE(kernelPropertiesBefore.flags & ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS); - } + EXPECT_TRUE(kernelPropertiesBefore.flags & ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS); EXPECT_NE(kernelPropertiesBefore.maxArgumentsSize, kernelProperties.maxArgumentsSize); EXPECT_NE(kernelPropertiesBefore.printfBufferSize, kernelProperties.printfBufferSize); @@ -2433,62 +2429,6 @@ TEST_F(DeviceHasFp64ButNoBitMathTest, givenDeviceWithFp64ButNoBitMathThenReportC EXPECT_TRUE(kernelProperties.fp32flags & ZE_DEVICE_FP_FLAG_FMA); } -struct DeviceHasNo64BitAtomicTest : public ::testing::Test { - void SetUp() override { - HardwareInfo nonFp64Device = *defaultHwInfo; - nonFp64Device.capabilityTable.ftrSupportsInteger64BitAtomics = false; - neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(&nonFp64Device, rootDeviceIndex); - NEO::DeviceVector devices; - devices.push_back(std::unique_ptr(neoDevice)); - driverHandle = std::make_unique>(); - driverHandle->initialize(std::move(devices)); - device = driverHandle->devices[rootDeviceIndex]; - } - - std::unique_ptr> driverHandle; - NEO::Device *neoDevice = nullptr; - L0::Device *device = nullptr; - const uint32_t rootDeviceIndex = 0u; -}; - -TEST_F(DeviceHasNo64BitAtomicTest, givenDeviceWithNoSupportForInteger64BitAtomicsThenFlagsAreSetCorrectly) { - ze_device_module_properties_t kernelProperties = {}; - memset(&kernelProperties, std::numeric_limits::max(), sizeof(ze_device_module_properties_t)); - kernelProperties.pNext = nullptr; - - device->getKernelProperties(&kernelProperties); - EXPECT_TRUE(kernelProperties.flags & ZE_DEVICE_MODULE_FLAG_FP16); - EXPECT_FALSE(kernelProperties.flags & ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS); -} - -struct DeviceHas64BitAtomicTest : public ::testing::Test { - void SetUp() override { - HardwareInfo nonFp64Device = *defaultHwInfo; - nonFp64Device.capabilityTable.ftrSupportsInteger64BitAtomics = true; - neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(&nonFp64Device, rootDeviceIndex); - NEO::DeviceVector devices; - devices.push_back(std::unique_ptr(neoDevice)); - driverHandle = std::make_unique>(); - driverHandle->initialize(std::move(devices)); - device = driverHandle->devices[rootDeviceIndex]; - } - - std::unique_ptr> driverHandle; - NEO::Device *neoDevice = nullptr; - L0::Device *device = nullptr; - const uint32_t rootDeviceIndex = 0u; -}; - -TEST_F(DeviceHas64BitAtomicTest, givenDeviceWithSupportForInteger64BitAtomicsThenFlagsAreSetCorrectly) { - ze_device_module_properties_t kernelProperties = {}; - memset(&kernelProperties, std::numeric_limits::max(), sizeof(ze_device_module_properties_t)); - kernelProperties.pNext = nullptr; - - device->getKernelProperties(&kernelProperties); - EXPECT_TRUE(kernelProperties.flags & ZE_DEVICE_MODULE_FLAG_FP16); - EXPECT_TRUE(kernelProperties.flags & ZE_DEVICE_MODULE_FLAG_INT64_ATOMICS); -} - struct MockMemoryManagerMultiDevice : public MemoryManagerMock { MockMemoryManagerMultiDevice(NEO::ExecutionEnvironment &executionEnvironment) : MemoryManagerMock(const_cast(executionEnvironment)) {} diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 72a7c67c46..5c93b9ccb6 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -688,13 +688,8 @@ TEST_F(DeviceGetCapsTest, WhenCheckingFp64ThenResultIsConsistentWithHardwareCapa auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); const auto &caps = device->getDeviceInfo(); - if (hwInfo.capabilityTable.ftrSupportsInteger64BitAtomics) { - EXPECT_TRUE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_base_atomics ")); - EXPECT_TRUE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_extended_atomics ")); - } else { - EXPECT_FALSE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_base_atomics ")); - EXPECT_FALSE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_extended_atomics ")); - } + EXPECT_TRUE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_base_atomics ")); + EXPECT_TRUE(hasSubstr(caps.deviceExtensions, "cl_khr_int64_extended_atomics ")); } TEST_F(DeviceGetCapsTest, WhenDeviceDoesNotSupportOcl21FeaturesThenDeviceEnqueueAndPipeAreNotSupported) { @@ -949,62 +944,59 @@ TEST_F(DeviceGetCapsTest, givenFp64SupportForcedWhenCheckingFp64SupportThenFp64I auto hwInfo = *defaultHwInfo; for (auto isFp64SupportedByHw : ::testing::Bool()) { - for (auto isInteger64BitAtomicsSupportedByHw : ::testing::Bool()) { - hwInfo.capabilityTable.ftrSupportsInteger64BitAtomics = isInteger64BitAtomicsSupportedByHw; - hwInfo.capabilityTable.ftrSupportsFP64 = isFp64SupportedByHw; - hwInfo.capabilityTable.ftrSupports64BitMath = isFp64SupportedByHw; + hwInfo.capabilityTable.ftrSupportsFP64 = isFp64SupportedByHw; + hwInfo.capabilityTable.ftrSupports64BitMath = isFp64SupportedByHw; - for (auto overrideDefaultFP64Settings : overrideDefaultFP64SettingsValues) { - debugManager.flags.OverrideDefaultFP64Settings.set(overrideDefaultFP64Settings); - auto pClDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); - auto &caps = pClDevice->getDeviceInfo(); - std::string extensionString = pClDevice->getDeviceInfo().deviceExtensions; + for (auto overrideDefaultFP64Settings : overrideDefaultFP64SettingsValues) { + debugManager.flags.OverrideDefaultFP64Settings.set(overrideDefaultFP64Settings); + auto pClDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); + auto &caps = pClDevice->getDeviceInfo(); + std::string extensionString = pClDevice->getDeviceInfo().deviceExtensions; - size_t fp64FeaturesCount = 0; - for (auto &openclCFeature : caps.openclCFeatures) { - if (0 == strcmp(openclCFeature.name, "__opencl_c_fp64")) { - fp64FeaturesCount++; - } - if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_global_atomic_add")) { - fp64FeaturesCount++; - } - if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_local_atomic_add")) { - fp64FeaturesCount++; - } - if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_global_atomic_min_max")) { - fp64FeaturesCount++; - } - if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_local_atomic_min_max")) { - fp64FeaturesCount++; - } + size_t fp64FeaturesCount = 0; + for (auto &openclCFeature : caps.openclCFeatures) { + if (0 == strcmp(openclCFeature.name, "__opencl_c_fp64")) { + fp64FeaturesCount++; } + if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_global_atomic_add")) { + fp64FeaturesCount++; + } + if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_local_atomic_add")) { + fp64FeaturesCount++; + } + if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_global_atomic_min_max")) { + fp64FeaturesCount++; + } + if (0 == strcmp(openclCFeature.name, "__opencl_c_ext_fp64_local_atomic_min_max")) { + fp64FeaturesCount++; + } + } - bool expectedFp64Support = ((overrideDefaultFP64Settings == -1) ? isFp64SupportedByHw : overrideDefaultFP64Settings); - if (expectedFp64Support) { - const size_t expectedFp64FeaturesCount = hwInfo.capabilityTable.supportsOcl21Features ? 5u : 1u; - EXPECT_NE(std::string::npos, extensionString.find(std::string("cl_khr_fp64"))); - EXPECT_NE(0u, caps.doubleFpConfig); - if (hwInfo.capabilityTable.supportsOcl21Features) { - const cl_device_fp_atomic_capabilities_ext expectedFpCaps = static_cast(CL_DEVICE_GLOBAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_GLOBAL_FP_ATOMIC_ADD_EXT | CL_DEVICE_GLOBAL_FP_ATOMIC_MIN_MAX_EXT | - CL_DEVICE_LOCAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_ADD_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_MIN_MAX_EXT); - EXPECT_EQ(expectedFpCaps, caps.doubleFpAtomicCapabilities); - } else { - const cl_device_fp_atomic_capabilities_ext expectedFpCaps = static_cast(CL_DEVICE_GLOBAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_LOAD_STORE_EXT); - EXPECT_EQ(expectedFpCaps, caps.doubleFpAtomicCapabilities); - } - EXPECT_EQ(expectedFp64FeaturesCount, fp64FeaturesCount); - EXPECT_NE(0u, caps.nativeVectorWidthDouble); - EXPECT_NE(0u, caps.preferredVectorWidthDouble); - EXPECT_TRUE(isValueSet(caps.singleFpConfig, CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT)); + bool expectedFp64Support = ((overrideDefaultFP64Settings == -1) ? isFp64SupportedByHw : overrideDefaultFP64Settings); + if (expectedFp64Support) { + const size_t expectedFp64FeaturesCount = hwInfo.capabilityTable.supportsOcl21Features ? 5u : 1u; + EXPECT_NE(std::string::npos, extensionString.find(std::string("cl_khr_fp64"))); + EXPECT_NE(0u, caps.doubleFpConfig); + if (hwInfo.capabilityTable.supportsOcl21Features) { + const cl_device_fp_atomic_capabilities_ext expectedFpCaps = static_cast(CL_DEVICE_GLOBAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_GLOBAL_FP_ATOMIC_ADD_EXT | CL_DEVICE_GLOBAL_FP_ATOMIC_MIN_MAX_EXT | + CL_DEVICE_LOCAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_ADD_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_MIN_MAX_EXT); + EXPECT_EQ(expectedFpCaps, caps.doubleFpAtomicCapabilities); } else { - EXPECT_EQ(std::string::npos, extensionString.find(std::string("cl_khr_fp64"))); - EXPECT_EQ(0u, caps.doubleFpConfig); - EXPECT_EQ(0u, caps.doubleFpAtomicCapabilities); - EXPECT_EQ(0u, fp64FeaturesCount); - EXPECT_EQ(0u, caps.nativeVectorWidthDouble); - EXPECT_EQ(0u, caps.preferredVectorWidthDouble); - EXPECT_FALSE(isValueSet(caps.singleFpConfig, CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT)); + const cl_device_fp_atomic_capabilities_ext expectedFpCaps = static_cast(CL_DEVICE_GLOBAL_FP_ATOMIC_LOAD_STORE_EXT | CL_DEVICE_LOCAL_FP_ATOMIC_LOAD_STORE_EXT); + EXPECT_EQ(expectedFpCaps, caps.doubleFpAtomicCapabilities); } + EXPECT_EQ(expectedFp64FeaturesCount, fp64FeaturesCount); + EXPECT_NE(0u, caps.nativeVectorWidthDouble); + EXPECT_NE(0u, caps.preferredVectorWidthDouble); + EXPECT_TRUE(isValueSet(caps.singleFpConfig, CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT)); + } else { + EXPECT_EQ(std::string::npos, extensionString.find(std::string("cl_khr_fp64"))); + EXPECT_EQ(0u, caps.doubleFpConfig); + EXPECT_EQ(0u, caps.doubleFpAtomicCapabilities); + EXPECT_EQ(0u, fp64FeaturesCount); + EXPECT_EQ(0u, caps.nativeVectorWidthDouble); + EXPECT_EQ(0u, caps.preferredVectorWidthDouble); + EXPECT_FALSE(isValueSet(caps.singleFpConfig, CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT)); } } } diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index 31f04e1379..9327322a70 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -323,13 +323,8 @@ TEST_F(PlatformTest, givenFtrSupportAtomicsWhenCreateExtentionsListThenGetMatchi getOpenclCFeaturesList(*hwInfo, features, *compilerProductHelper.get(), releaseHelper.get()); std::string compilerExtensions = convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str(), features); - if (hwInfo->capabilityTable.ftrSupportsInteger64BitAtomics) { - EXPECT_TRUE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_base_atomics"))); - EXPECT_TRUE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_extended_atomics"))); - } else { - EXPECT_FALSE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_base_atomics"))); - EXPECT_FALSE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_extended_atomics"))); - } + EXPECT_TRUE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_base_atomics"))); + EXPECT_TRUE(hasSubstr(compilerExtensions, std::string("cl_khr_int64_extended_atomics"))); } TEST_F(PlatformTest, givenSupportedMediaBlockAndClVersion21WhenCreateExtentionsListThenDeviceReportsSpritvMediaBlockIoExtension) { diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index 0a53647f01..be0dec7b50 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable ADLN::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 6990201964..2fe8c4cf7a 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable ADLP::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 15c7b61b25..9071773ce4 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable ADLS::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 6a9a097770..216caa0b13 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable DG1::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index e04809f886..d95a6a67bd 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable RKL::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index 84fb54b4d3..8455885e69 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable TGLLP::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = false, diff --git a/shared/source/helpers/compiler_product_helper_base.inl b/shared/source/helpers/compiler_product_helper_base.inl index a461c6cd7e..395672c748 100644 --- a/shared/source/helpers/compiler_product_helper_base.inl +++ b/shared/source/helpers/compiler_product_helper_base.inl @@ -88,7 +88,9 @@ std::string CompilerProductHelperHw::getDeviceExtensions(const Hardw "cl_khr_expect_assume " "cl_khr_extended_bit_ops " "cl_khr_suggested_local_work_size " - "cl_intel_split_work_group_barrier "; + "cl_intel_split_work_group_barrier " + "cl_khr_int64_base_atomics " + "cl_khr_int64_extended_atomics "; auto supportsFp64 = hwInfo.capabilityTable.ftrSupportsFP64; if (debugManager.flags.OverrideDefaultFP64Settings.get() != -1) { @@ -139,11 +141,6 @@ std::string CompilerProductHelperHw::getDeviceExtensions(const Hardw extensions += "cl_intel_packed_yuv "; } - if (hwInfo.capabilityTable.ftrSupportsInteger64BitAtomics) { - extensions += "cl_khr_int64_base_atomics "; - extensions += "cl_khr_int64_extended_atomics "; - } - if (hwInfo.capabilityTable.supportsImages) { extensions += "cl_khr_image2d_from_buffer "; extensions += "cl_khr_depth_images "; diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h index 86d772732d..d777ae9d45 100644 --- a/shared/source/helpers/hw_info.h +++ b/shared/source/helpers/hw_info.h @@ -37,7 +37,6 @@ struct RuntimeCapabilityTable { uint32_t timestampValidBits; uint32_t kernelTimestampValidBits; bool blitterOperationsSupported; - bool ftrSupportsInteger64BitAtomics; bool ftrSupportsFP64; bool ftrSupportsFP64Emulation; bool ftrSupports64BitMath; diff --git a/shared/source/xe2_hpg_core/hw_info_bmg.cpp b/shared/source/xe2_hpg_core/hw_info_bmg.cpp index db7c617a3c..7eced5228d 100644 --- a/shared/source/xe2_hpg_core/hw_info_bmg.cpp +++ b/shared/source/xe2_hpg_core/hw_info_bmg.cpp @@ -53,7 +53,6 @@ const RuntimeCapabilityTable BMG::capabilityTable{ .timestampValidBits = 64, .kernelTimestampValidBits = 64, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/source/xe2_hpg_core/hw_info_lnl.cpp b/shared/source/xe2_hpg_core/hw_info_lnl.cpp index 5accffdf36..8542fb0024 100644 --- a/shared/source/xe2_hpg_core/hw_info_lnl.cpp +++ b/shared/source/xe2_hpg_core/hw_info_lnl.cpp @@ -51,7 +51,6 @@ const RuntimeCapabilityTable LNL::capabilityTable{ .timestampValidBits = 64, .kernelTimestampValidBits = 64, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/source/xe3_core/hw_info_ptl.cpp b/shared/source/xe3_core/hw_info_ptl.cpp index 221f07ad5e..aacc4d56c3 100644 --- a/shared/source/xe3_core/hw_info_ptl.cpp +++ b/shared/source/xe3_core/hw_info_ptl.cpp @@ -52,7 +52,6 @@ const RuntimeCapabilityTable PTL::capabilityTable{ .timestampValidBits = 64, .kernelTimestampValidBits = 64, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index cca7206ada..50a4207ce2 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -63,7 +63,6 @@ const RuntimeCapabilityTable PVC::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/source/xe_hpg_core/hw_info_arl.cpp b/shared/source/xe_hpg_core/hw_info_arl.cpp index 3628f4e59e..39b5fd13d6 100644 --- a/shared/source/xe_hpg_core/hw_info_arl.cpp +++ b/shared/source/xe_hpg_core/hw_info_arl.cpp @@ -48,7 +48,6 @@ const RuntimeCapabilityTable ARL::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index d1db73c610..edf8364501 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -54,7 +54,6 @@ const RuntimeCapabilityTable DG2::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = false, .ftrSupportsFP64Emulation = true, .ftrSupports64BitMath = true, diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp index b4c0c0f7d4..372398550b 100644 --- a/shared/source/xe_hpg_core/hw_info_mtl.cpp +++ b/shared/source/xe_hpg_core/hw_info_mtl.cpp @@ -50,7 +50,6 @@ const RuntimeCapabilityTable MTL::capabilityTable{ .timestampValidBits = 36u, .kernelTimestampValidBits = 32u, .blitterOperationsSupported = false, - .ftrSupportsInteger64BitAtomics = true, .ftrSupportsFP64 = true, .ftrSupportsFP64Emulation = false, .ftrSupports64BitMath = true, diff --git a/shared/test/unit_test/gen12lp/adln/CMakeLists.txt b/shared/test/unit_test/gen12lp/adln/CMakeLists.txt index a96fd25629..eea106196c 100644 --- a/shared/test/unit_test/gen12lp/adln/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/adln/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2022-2023 Intel Corporation +# Copyright (C) 2022-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,9 +11,8 @@ if(TESTS_ADLN) target_sources(neo_shared_tests PRIVATE ${NEO_CORE_tests_gen12lp_adln_excludes} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adln.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_product_helper_adln.cpp ) add_subdirectories() -endif() \ No newline at end of file +endif() diff --git a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp deleted file mode 100644 index ad022d6d10..0000000000 --- a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2022-2025 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/gen12lp/hw_cmds_adln.h" -#include "shared/source/gen12lp/hw_info_adln.h" -#include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" - -using namespace NEO; - -using AdlnUsDeviceIdTest = Test; - -ADLNTEST_F(AdlnUsDeviceIdTest, givenAdlnWhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} diff --git a/shared/test/unit_test/gen12lp/adlp/CMakeLists.txt b/shared/test/unit_test/gen12lp/adlp/CMakeLists.txt index 9b06b30d9e..b5cdbe3113 100644 --- a/shared/test/unit_test/gen12lp/adlp/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/adlp/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021-2023 Intel Corporation +# Copyright (C) 2021-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -13,7 +13,6 @@ if(TESTS_ADLP) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_adlp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/preamble_helper_tests_adlp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adlp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_product_helper_adlp.cpp ) diff --git a/shared/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp deleted file mode 100644 index 340beb1acb..0000000000 --- a/shared/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021-2025 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/gen12lp/hw_cmds_adlp.h" -#include "shared/source/gen12lp/hw_info_adlp.h" -#include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" - -using namespace NEO; - -using AdlpUsDeviceIdTest = Test; - -ADLPTEST_F(AdlpUsDeviceIdTest, givenADLPWhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} diff --git a/shared/test/unit_test/gen12lp/adls/CMakeLists.txt b/shared/test/unit_test/gen12lp/adls/CMakeLists.txt index d704116717..a93f29c070 100644 --- a/shared/test/unit_test/gen12lp/adls/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/adls/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2021-2023 Intel Corporation +# Copyright (C) 2021-2025 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,7 +11,6 @@ if(TESTS_ADLS) target_sources(neo_shared_tests PRIVATE ${NEO_CORE_tests_gen12lp_adls_excludes} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adls.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_product_helper_adls.cpp ) diff --git a/shared/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp deleted file mode 100644 index e26663e4d6..0000000000 --- a/shared/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2020-2025 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/gen12lp/hw_cmds_adls.h" -#include "shared/source/gen12lp/hw_info_adls.h" -#include "shared/test/common/fixtures/device_fixture.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" - -using namespace NEO; - -using AdlsUsDeviceIdTest = Test; - -ADLSTEST_F(AdlsUsDeviceIdTest, givenAdlsWhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} diff --git a/shared/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp index 95d43d9e98..2db5d3e2d7 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp @@ -20,10 +20,6 @@ DG1TEST_F(Dg1DeviceCaps, givenDg1WhenCheckSupportCacheFlushAfterWalkerThenFalse) EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.supportCacheFlushAfterWalker); } -DG1TEST_F(Dg1DeviceCaps, givenDg1WhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - DG1TEST_F(Dg1DeviceCaps, givenDg1WhenCheckGpuAddressSpaceThenReturn47bits) { EXPECT_EQ(MemoryConstants::max64BitAppAddress, pDevice->getHardwareInfo().capabilityTable.gpuAddressSpace); } 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 d24a35ea8f..c5ef0a4a31 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, givenRklWhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) { - const HardwareInfo &hardwareInfo = RKL::hwInfo; - EXPECT_TRUE(hardwareInfo.capabilityTable.ftrSupportsInteger64BitAtomics); -} - using RklProductHelper = ProductHelperTest; RKLTEST_F(RklProductHelper, givenCompilerProductHelperWhenGetProductConfigThenCorrectMatchIsFound) { diff --git a/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index 246864d97b..a82f9b7936 100644 --- a/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -68,10 +68,6 @@ HWTEST2_F(Gen12LpDeviceCaps, givenTglLpWhenCheckSupportCacheFlushAfterWalkerThen EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportCacheFlushAfterWalker); } -HWTEST2_F(Gen12LpDeviceCaps, givenGen12lpWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue, IsTGLLP) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - GEN12LPTEST_F(Gen12LpDeviceCaps, givenGen12LpWhenCheckingCxlTypeThenReturnZero) { EXPECT_EQ(0u, pDevice->getHardwareInfo().capabilityTable.cxlType); } diff --git a/shared/test/unit_test/xe2_hpg_core/test_device_caps_xe2_hpg_core.cpp b/shared/test/unit_test/xe2_hpg_core/test_device_caps_xe2_hpg_core.cpp index f56183aff4..699ca99fa4 100644 --- a/shared/test/unit_test/xe2_hpg_core/test_device_caps_xe2_hpg_core.cpp +++ b/shared/test/unit_test/xe2_hpg_core/test_device_caps_xe2_hpg_core.cpp @@ -16,10 +16,6 @@ using namespace NEO; using Xe2HpgCoreDeviceCaps = Test; -XE2_HPG_CORETEST_F(Xe2HpgCoreDeviceCaps, givenXe2HpgCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - XE2_HPG_CORETEST_F(Xe2HpgCoreDeviceCaps, givenXe2HpgCoreWhenCheckingImageSupportThenReturnFalse) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.supportsImages); } diff --git a/shared/test/unit_test/xe3_core/test_device_caps_xe3_core.cpp b/shared/test/unit_test/xe3_core/test_device_caps_xe3_core.cpp index 58327b284a..4fca37511b 100644 --- a/shared/test/unit_test/xe3_core/test_device_caps_xe3_core.cpp +++ b/shared/test/unit_test/xe3_core/test_device_caps_xe3_core.cpp @@ -32,10 +32,6 @@ XE3_CORETEST_F(Xe3CoreDeviceCaps, givenXe3CoreProductWhenCheckingCapabilitiesThe EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.timestampValidBits); } -XE3_CORETEST_F(Xe3CoreDeviceCaps, givenXe3CoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - XE3_CORETEST_F(Xe3CoreDeviceCaps, givenXe3CoreWhenCheckingMediaBlockSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportsMediaBlock); } diff --git a/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index 2323767b5e..2127f34794 100644 --- a/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -17,10 +17,6 @@ using namespace NEO; using XeHpcCoreDeviceCaps = Test; -XE_HPC_CORETEST_F(XeHpcCoreDeviceCaps, givenXeHpcCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - XE_HPC_CORETEST_F(XeHpcCoreDeviceCaps, givenXeHpcCoreWhenCheckingImageSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportsImages); } diff --git a/shared/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp index 61f739c2d2..3c59739728 100644 --- a/shared/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp +++ b/shared/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp @@ -17,10 +17,6 @@ using namespace NEO; using XeHpgCoreDeviceCaps = Test; -XE_HPG_CORETEST_F(XeHpgCoreDeviceCaps, givenXeHpgCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { - EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); -} - XE_HPG_CORETEST_F(XeHpgCoreDeviceCaps, givenXeHpgCoreWhenCheckingImageSupportThenReturnTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.supportsImages); }