Skip to content

Commit 3a31caf

Browse files
Compute-Runtime-ValidationCompute-Runtime-Automation
Compute-Runtime-Validation
authored and
Compute-Runtime-Automation
committed
Revert "Add member for handling additional adapterInfo fields"
This reverts commit aafbbf5. Signed-off-by: Compute-Runtime-Validation <[email protected]>
1 parent 140e744 commit 3a31caf

File tree

10 files changed

+17
-78
lines changed

10 files changed

+17
-78
lines changed

‎opencl/source/sharings/d3d/enable_d3d.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ std::string D3DSharingBuilderFactory<D3DTypesHelper::D3D9>::getExtensions(Driver
104104
}
105105

106106
std::string D3DSharingBuilderFactory<D3DTypesHelper::D3D10>::getExtensions(DriverInfo *driverInfo) {
107-
return extensionEnabled ? "cl_khr_d3d10_sharing " : "";
107+
return "cl_khr_d3d10_sharing ";
108108
}
109109

110110
std::string D3DSharingBuilderFactory<D3DTypesHelper::D3D11>::getExtensions(DriverInfo *driverInfo) {
111-
return extensionEnabled ? "cl_khr_d3d11_sharing cl_intel_d3d11_nv12_media_sharing " : "";
111+
return "cl_khr_d3d11_sharing cl_intel_d3d11_nv12_media_sharing ";
112112
}
113113

114114
void D3DSharingBuilderFactory<D3DTypesHelper::D3D9>::fillGlobalDispatchTable() {
@@ -169,13 +169,9 @@ void D3DSharingBuilderFactory<D3DTypesHelper::D3D9>::setExtensionEnabled(DriverI
169169
extensionEnabled = driverInfo->getMediaSharingSupport();
170170
}
171171

172-
void D3DSharingBuilderFactory<D3DTypesHelper::D3D10>::setExtensionEnabled(DriverInfo *driverInfo) {
173-
extensionEnabled = driverInfo->getMediaSharingSupport();
174-
}
172+
void D3DSharingBuilderFactory<D3DTypesHelper::D3D10>::setExtensionEnabled(DriverInfo *driverInfo) {}
175173

176-
void D3DSharingBuilderFactory<D3DTypesHelper::D3D11>::setExtensionEnabled(DriverInfo *driverInfo) {
177-
extensionEnabled = driverInfo->getMediaSharingSupport();
178-
}
174+
void D3DSharingBuilderFactory<D3DTypesHelper::D3D11>::setExtensionEnabled(DriverInfo *driverInfo) {}
179175

180176
static SharingFactory::RegisterSharing<D3DSharingBuilderFactory<D3DTypesHelper::D3D9>, D3DSharingFunctions<D3DTypesHelper::D3D9>> D3D9Sharing;
181177
static SharingFactory::RegisterSharing<D3DSharingBuilderFactory<D3DTypesHelper::D3D10>, D3DSharingFunctions<D3DTypesHelper::D3D10>> D3D10Sharing;

‎opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -850,25 +850,12 @@ TEST(D3D10, givenD3D10BuilderWhenGettingExtensionsThenCorrectExtensionsListIsRet
850850
EXPECT_TRUE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_khr_d3d10_sharing")));
851851
}
852852

853-
TEST(D3D10, givenD3D10BuilderAndExtensionEnableFalseWhenGettingExtensionsThenCorrectExtensionsListIsReturned) {
854-
auto builderFactory = std::make_unique<D3DSharingBuilderFactory<D3DTypesHelper::D3D10>>();
855-
builderFactory->extensionEnabled = false;
856-
EXPECT_FALSE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_khr_d3d10_sharing")));
857-
}
858-
859853
TEST(D3D11, givenD3D11BuilderWhenGettingExtensionsThenCorrectExtensionsListIsReturned) {
860854
auto builderFactory = std::make_unique<D3DSharingBuilderFactory<D3DTypesHelper::D3D11>>();
861855
EXPECT_TRUE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_khr_d3d11_sharing")));
862856
EXPECT_TRUE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_intel_d3d11_nv12_media_sharing")));
863857
}
864858

865-
TEST(D3D11, givenD3D11BuilderAndExtensionEnableFalseWhenGettingExtensionsThenCorrectExtensionsListIsReturned) {
866-
auto builderFactory = std::make_unique<D3DSharingBuilderFactory<D3DTypesHelper::D3D11>>();
867-
builderFactory->extensionEnabled = false;
868-
EXPECT_FALSE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_khr_d3d11_sharing")));
869-
EXPECT_FALSE(hasSubstr(builderFactory->getExtensions(nullptr), std::string("cl_intel_d3d11_nv12_media_sharing")));
870-
}
871-
872859
TEST(D3DSharingFactory, givenEnabledFormatQueryAndFactoryWithD3DSharingsWhenGettingExtensionFunctionAddressThenFormatQueryFunctionsAreReturned) {
873860
DebugManagerStateRestore restorer;
874861
DebugManager.flags.EnableFormatQuery.set(true);

‎shared/source/os_interface/windows/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
1515
${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp
1616
${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h
1717
${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
18-
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}driver_info_windows_impl.cpp
1918
${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.cpp
2019
${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.h
2120
${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h
@@ -84,7 +83,6 @@ set(NEO_CORE_OS_INTERFACE_WDDM
8483
${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory.h
8584
${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory_dxcore.cpp
8685
${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory_dxcore.h
87-
${CMAKE_CURRENT_SOURCE_DIR}/wddm${BRANCH_DIR_SUFFIX}wddm_additional_adapter_info_options.cpp
8886
${CMAKE_CURRENT_SOURCE_DIR}/wddm/configure_device_address_space_${DRIVER_MODEL}.cpp
8987
${CMAKE_CURRENT_SOURCE_DIR}/wddm/set_gmm_input_args_${DRIVER_MODEL}.cpp
9088
${CMAKE_CURRENT_SOURCE_DIR}/wddm/max_mem_alloc_size_${DRIVER_MODEL}.cpp

‎shared/source/os_interface/windows/driver_info_windows.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ std::string getCurrentLibraryPath() {
3333
}
3434

3535
namespace NEO {
36+
37+
DriverInfo *DriverInfo::create(const HardwareInfo *hwInfo, const OSInterface *osInterface) {
38+
if (osInterface == nullptr) {
39+
return nullptr;
40+
}
41+
42+
auto wddm = osInterface->getDriverModel()->as<Wddm>();
43+
UNRECOVERABLE_IF(wddm == nullptr);
44+
45+
return new DriverInfoWindows(wddm->getDeviceRegistryPath(), wddm->getPciBusInfo());
46+
};
47+
3648
DriverInfoWindows::DriverInfoWindows(const std::string &fullPath, const PhysicalDevicePciBusInfo &pciBusInfo)
3749
: path(DriverInfoWindows::trimRegistryKey(fullPath)), registryReader(createRegistryReaderFunc(path)) {
3850
this->pciBusInfo = pciBusInfo;

‎shared/source/os_interface/windows/driver_info_windows_impl.cpp‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎shared/source/os_interface/windows/wddm/wddm.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,6 @@ bool Wddm::queryAdapterInfo() {
188188
maxRenderFrequency = adapterInfo.MaxRenderFreq;
189189
timestampFrequency = adapterInfo.GfxTimeStampFreq;
190190
instrumentationEnabled = adapterInfo.Caps.InstrumentationIsEnabled != 0;
191-
192-
populateAdditionalAdapterInfoOptions(adapterInfo);
193191
}
194192

195193
return status == STATUS_SUCCESS;

‎shared/source/os_interface/windows/wddm/wddm.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,6 @@ class Wddm : public DriverModel {
207207

208208
PhyicalDevicePciSpeedInfo getPciSpeedInfo() const override;
209209

210-
uint32_t getAdditionalAdapterInfoOptions() {
211-
return additionalAdapterInfoOptions;
212-
}
213-
214210
protected:
215211
Wddm(std::unique_ptr<HwDeviceIdWddm> &&hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment);
216212
MOCKABLE_VIRTUAL bool waitOnGPU(D3DKMT_HANDLE context);
@@ -228,7 +224,6 @@ class Wddm : public DriverModel {
228224
return evictNeeded;
229225
}
230226
void setPlatformSupportEvictWhenNecessaryFlag(const HwInfoConfig &hwInfoConfig);
231-
void populateAdditionalAdapterInfoOptions(const ADAPTER_INFO_KMD &adapterInfo);
232227

233228
GMM_GFX_PARTITIONING gfxPartition{};
234229
ADAPTER_BDF adapterBDF{};
@@ -270,7 +265,6 @@ class Wddm : public DriverModel {
270265

271266
uint32_t maxRenderFrequency = 0;
272267
uint32_t timestampFrequency = 0u;
273-
uint32_t additionalAdapterInfoOptions = 0u;
274268

275269
unsigned int enablePreemptionRegValue = 1;
276270

‎shared/source/os_interface/windows/wddm/wddm_additional_adapter_info_options.cpp‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎shared/test/common/mocks/mock_wddm.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ constexpr auto virtualAllocAddress = is64bit ? 0x7FFFF0000000 : 0xFF000000;
2828
class WddmMock : public Wddm {
2929
public:
3030
using Wddm::adapterBDF;
31-
using Wddm::additionalAdapterInfoOptions;
3231
using Wddm::adjustEvictNeededParameter;
3332
using Wddm::createPagingFenceLogger;
3433
using Wddm::currentPagingFenceValue;
@@ -45,7 +44,6 @@ class WddmMock : public Wddm {
4544
using Wddm::pagingFenceAddress;
4645
using Wddm::pagingQueue;
4746
using Wddm::platformSupportsEvictWhenNecessary;
48-
using Wddm::populateAdditionalAdapterInfoOptions;
4947
using Wddm::residencyLogger;
5048
using Wddm::rootDeviceEnvironment;
5149
using Wddm::setPlatformSupportEvictWhenNecessaryFlag;
@@ -104,7 +102,7 @@ class WddmMock : public Wddm {
104102

105103
bool configureDeviceAddressSpace() {
106104
configureDeviceAddressSpaceResult.called++;
107-
// create context cant be called before configureDeviceAddressSpace
105+
//create context cant be called before configureDeviceAddressSpace
108106
if (createContextResult.called > 0) {
109107
return configureDeviceAddressSpaceResult.success = false;
110108
} else {

‎shared/test/unit_test/os_interface/windows/wddm_tests.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ TEST_F(WddmTests, GivenPlatformSupportsEvictWhenNecessaryWhenAdjustingEvictNeede
149149
EXPECT_TRUE(value);
150150
}
151151

152-
TEST_F(WddmTests, GivenWddmWhenAdditionalAdapterInfoOptionIsSetThenCorrectValueIsReturned) {
153-
wddm->additionalAdapterInfoOptions = 13u;
154-
EXPECT_EQ(13u, wddm->getAdditionalAdapterInfoOptions());
155-
}
156-
157152
TEST_F(WddmTests, GivenPlatformNotSupportEvictWhenNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
158153
wddm->platformSupportsEvictWhenNecessary = false;
159154
bool value = wddm->adjustEvictNeededParameter(true);

0 commit comments

Comments
 (0)