Revert "refactor: Store AIL in root device environment"

This reverts commit 02ef252b7d.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-11-16 19:04:39 +01:00
committed by Compute-Runtime-Automation
parent c68f55e4f6
commit 27000c06cb
14 changed files with 181 additions and 97 deletions

View File

@@ -101,6 +101,11 @@ void RootDeviceEnvironment::prepareForCleanup() const {
}
bool RootDeviceEnvironment::initAilConfiguration() {
if (!DebugManager.flags.EnableAIL.get()) {
return true;
}
auto ailConfiguration = AILConfiguration::get(hwInfo->platform.eProductFamily);
if (ailConfiguration == nullptr) {
return true;
}
@@ -156,7 +161,6 @@ void RootDeviceEnvironment::initHelpers() {
initApiGfxCoreHelper();
initCompilerProductHelper();
initReleaseHelper();
initAilConfigurationHelper();
}
void RootDeviceEnvironment::initGfxCoreHelper() {
@@ -182,20 +186,10 @@ void RootDeviceEnvironment::initReleaseHelper() {
}
}
void RootDeviceEnvironment::initAilConfigurationHelper() {
if (ailConfiguration == nullptr && DebugManager.flags.EnableAIL.get()) {
ailConfiguration = AILConfiguration::create(this->getHardwareInfo()->platform.eProductFamily);
}
}
ReleaseHelper *RootDeviceEnvironment::getReleaseHelper() const {
return releaseHelper.get();
}
AILConfiguration *RootDeviceEnvironment::getAILConfigurationHelper() const {
return ailConfiguration.get();
}
BuiltIns *RootDeviceEnvironment::getBuiltIns() {
if (this->builtins.get() == nullptr) {
std::lock_guard<std::mutex> autolock(this->mtx);

View File

@@ -40,7 +40,6 @@ class ApiGfxCoreHelper;
class CompilerProductHelper;
class GraphicsAllocation;
class ReleaseHelper;
class AILConfiguration;
struct AllocationProperties;
struct HardwareInfo;
@@ -86,9 +85,7 @@ struct RootDeviceEnvironment : NonCopyableClass {
void initApiGfxCoreHelper();
void initCompilerProductHelper();
void initReleaseHelper();
void initAilConfigurationHelper();
ReleaseHelper *getReleaseHelper() const;
AILConfiguration *getAILConfigurationHelper() const;
template <typename HelperType>
HelperType &getHelper() const;
const ProductHelper &getProductHelper() const;
@@ -111,7 +108,6 @@ struct RootDeviceEnvironment : NonCopyableClass {
std::unique_ptr<ProductHelper> productHelper;
std::unique_ptr<CompilerProductHelper> compilerProductHelper;
std::unique_ptr<ReleaseHelper> releaseHelper;
std::unique_ptr<AILConfiguration> ailConfiguration;
std::unique_ptr<AssertHandler> assertHandler;