Revert "Limit number of CCS engines on PVC"

This reverts commit 8f8370b. Signed-off-by: Mateusz Jablonski <[email protected]>
intel · Aug 8, 2022 · 3b3d402 · 3b3d402
1 parent ed0c361
commit 3b3d402
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 66 deletions.
diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp
@@ -199,14 +199,4 @@ void ExecutionEnvironment::parseAffinityMask() {
 
     rootDeviceEnvironments.swap(filteredEnvironments);
 }
-
-void ExecutionEnvironment::adjustCcsCount() const {
-    for (auto &rootDeviceEnvironment : rootDeviceEnvironments) {
-        UNRECOVERABLE_IF(!rootDeviceEnvironment);
-        auto hwInfo = rootDeviceEnvironment->getMutableHardwareInfo();
-        auto hwInfoConfig = HwInfoConfig::get(hwInfo->platform.eProductFamily);
-        hwInfoConfig->adjustNumberOfCcs(*hwInfo);
-    }
-}
-
 } // namespace NEO
diff --git a/shared/source/execution_environment/execution_environment.h b/shared/source/execution_environment/execution_environment.h
@@ -27,7 +27,6 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
     virtual void prepareRootDeviceEnvironments(uint32_t numRootDevices);
     void prepareRootDeviceEnvironment(const uint32_t rootDeviceIndexForReInit);
     void parseAffinityMask();
-    void adjustCcsCount() const;
     void sortNeoDevices();
     void sortNeoDevicesDRM();
     void sortNeoDevicesWDDM();

diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp
@@ -99,7 +99,6 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE
     }
 
     executionEnvironment.parseAffinityMask();
-    executionEnvironment.adjustCcsCount();
     executionEnvironment.calculateMaxOsContextCount();
     return true;
 }
@@ -159,7 +158,6 @@ bool DeviceFactory::prepareDeviceEnvironments(ExecutionEnvironment &executionEnv
 
     executionEnvironment.sortNeoDevices();
     executionEnvironment.parseAffinityMask();
-    executionEnvironment.adjustCcsCount();
     executionEnvironment.calculateMaxOsContextCount();
 
     return true;

diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
@@ -132,7 +132,6 @@ class HwInfoConfig {
     virtual bool isAssignEngineRoundRobinSupported() const = 0;
     virtual uint32_t getL1CachePolicy() const = 0;
     virtual bool isEvictionWhenNecessaryFlagSupported() const = 0;
-    virtual void adjustNumberOfCcs(HardwareInfo &hwInfo) const = 0;
 
     MOCKABLE_VIRTUAL ~HwInfoConfig() = default;
 
@@ -235,7 +234,6 @@ class HwInfoConfigHw : public HwInfoConfig {
     bool isAssignEngineRoundRobinSupported() const override;
     uint32_t getL1CachePolicy() const override;
     bool isEvictionWhenNecessaryFlagSupported() const override;
-    void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
 
   protected:
     HwInfoConfigHw() = default;

diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl
@@ -480,6 +480,4 @@ uint32_t HwInfoConfigHw<gfxProduct>::getL1CachePolicy() const {
     return L1CachePolicyHelper<gfxProduct>::getL1CachePolicy();
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-void HwInfoConfigHw<gfxProduct>::adjustNumberOfCcs(HardwareInfo &hwInfo) const {}
 } // namespace NEO
diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl
@@ -193,9 +193,4 @@ bool HwInfoConfigHw<gfxProduct>::isComputeDispatchAllWalkerEnableInCfeStateRequi
 template <>
 bool HwInfoConfigHw<gfxProduct>::isIpSamplingSupported(const HardwareInfo &hwInfo) const {
     return PVC::isXt(hwInfo);
-}
-
-template <>
-void HwInfoConfigHw<gfxProduct>::adjustNumberOfCcs(HardwareInfo &hwInfo) const {
-    hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 1;
 }
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
@@ -8,7 +8,6 @@ if(TESTS_PVC)
   set(NEO_SHARED_TESTS_PVC
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp

diff --git a/shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp