intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 17:41:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix OCL specific registry path in a core dir

Browse Source 
Change-Id: I5b7792582e6c77a29ffb42b8fe024bc826ae1867
Signed-off-by: Jobczyk, Lukasz <lukasz.jobczyk@intel.com>
This commit is contained in:
Jobczyk, Lukasz
2019-09-02 12:04:22 +02:00
committed by sys_ocldev
parent 712313a3be
commit 86edfea3bf
23 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/main.cpp
View File

@@ -11,6 +11,7 @@
#include "runtime/helpers/options.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/hw_info_config.h"
#include "runtime/os_interface/ocl_reg_path.h"
#include "unit_tests/custom_event_listener.h"
#include "unit_tests/mocks/mock_gmm.h"
#include "unit_tests/mocks/mock_program.h"
@@ -275,7 +276,7 @@ int main(int argc, char **argv) {
generateRandomInput = true;
} else if (!strcmp("--read-config", argv[i]) && testMode == TestMode::AubTests) {
if (DebugManager.registryReadAvailable()) {
DebugManager.setReaderImpl(SettingsReader::create());
DebugManager.setReaderImpl(SettingsReader::create(oclRegPath));
DebugManager.injectSettingsFromReader();
}
} else if (!strcmp("--dump_buffer_format", argv[i]) && testMode == TestMode::AubTests) {

9
unit_tests/os_interface/debug_settings_manager_tests.cpp
View File

@@ -7,6 +7,7 @@
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "core/utilities/debug_file_reader.h"
#include "runtime/os_interface/ocl_reg_path.h"
#include "unit_tests/fixtures/buffer_fixture.h"
#include "unit_tests/fixtures/image_fixture.h"
#include "unit_tests/mocks/mock_buffer.h"
@@ -42,7 +43,7 @@ TEST(DebugSettingsManager, WithDebugFunctionalityCreatesAndDumpsToLogFile) {
FullyEnabledTestDebugManager debugManager;
if (debugManager.registryReadAvailable()) {
debugManager.setReaderImpl(SettingsReader::create());
debugManager.setReaderImpl(SettingsReader::create(oclRegPath));
debugManager.injectSettingsFromReader();
}
debugManager.logApiCall("searchString", true, 0);
@@ -850,16 +851,16 @@ TEST(DebugSettingsManager, givenStringDebugVariableWhenLongValueExeedingSmallStr
TEST(DebugSettingsManager, givenNullAsReaderImplInDebugManagerWhenSettingReaderImplThenItsSetProperly) {
FullyDisabledTestDebugManager debugManager;
auto readerImpl = SettingsReader::create();
auto readerImpl = SettingsReader::create(oclRegPath);
debugManager.setReaderImpl(readerImpl);
EXPECT_EQ(readerImpl, debugManager.getReaderImpl());
}
TEST(DebugSettingsManager, givenReaderImplInDebugManagerWhenSettingDifferentReaderImplThenItsSetProperly) {
FullyDisabledTestDebugManager debugManager;
auto readerImpl = SettingsReader::create();
auto readerImpl = SettingsReader::create(oclRegPath);
debugManager.setReaderImpl(readerImpl);
auto readerImpl2 = SettingsReader::create();
auto readerImpl2 = SettingsReader::create(oclRegPath);
debugManager.setReaderImpl(readerImpl2);
EXPECT_EQ(readerImpl2, debugManager.getReaderImpl());
}

4
unit_tests/os_interface/linux/debug_env_reader.cpp
View File

@@ -16,7 +16,7 @@ namespace NEO {
class DebugEnvReaderTests : public ::testing::Test {
public:
void SetUp() override {
evr = SettingsReader::createOsReader(false);
evr = SettingsReader::createOsReader(false, "");
EXPECT_NE(nullptr, evr);
}
void TearDown() override {
@@ -79,7 +79,7 @@ TEST_F(DebugEnvReaderTests, appSpecificLacationReturnClCacheLocation) {
}
TEST_F(DebugEnvReaderTests, givenEnvironmentVariableReaderWhenCreateOsReaderWithStringThenNotNullPointer) {
std::unique_ptr<SettingsReader> evr(SettingsReader::createOsReader(""));
std::unique_ptr<SettingsReader> evr(SettingsReader::createOsReader(false, ""));
EXPECT_NE(nullptr, evr);
}
} // namespace NEO

5
unit_tests/os_interface/windows/registry_reader_tests.h
View File

@@ -6,12 +6,13 @@
*/
#include "core/os_interface/windows/debug_registry_reader.h"
#include "runtime/os_interface/ocl_reg_path.h"
namespace NEO {
class TestedRegistryReader : public RegistryReader {
public:
TestedRegistryReader(bool userScope) : RegistryReader(userScope){};
TestedRegistryReader(std::string regKey) : RegistryReader(regKey){};
TestedRegistryReader(bool userScope) : RegistryReader(userScope, oclRegPath){};
TestedRegistryReader(std::string regKey) : RegistryReader(false, regKey){};
HKEY getHkeyType() const {
return igdrclHkeyType;
}

4
unit_tests/utilities/debug_settings_reader_creator.cpp
View File

@@ -8,7 +8,7 @@
#include "core/utilities/debug_settings_reader_creator.h"
namespace NEO {
std::unique_ptr<SettingsReader> SettingsReaderCreator::create() {
return std::unique_ptr<SettingsReader>(SettingsReader::createOsReader(false));
std::unique_ptr<SettingsReader> SettingsReaderCreator::create(const std::string &regKey) {
return std::unique_ptr<SettingsReader>(SettingsReader::createOsReader(false, regKey));
}
} // namespace NEO

9
unit_tests/utilities/debug_settings_reader_tests.cpp
View File

@@ -8,6 +8,7 @@
#include "core/utilities/debug_settings_reader.h"
#include "runtime/helpers/file_io.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/ocl_reg_path.h"
#include "test.h"
#include "gtest/gtest.h"
@@ -19,7 +20,7 @@ using namespace NEO;
using namespace std;
TEST(SettingsReader, Create) {
SettingsReader *reader = SettingsReader::create();
SettingsReader *reader = SettingsReader::create(oclRegPath);
EXPECT_NE(nullptr, reader);
delete reader;
}
@@ -40,14 +41,14 @@ TEST(SettingsReader, CreateFileReader) {
}
TEST(SettingsReader, CreateOsReader) {
SettingsReader *reader = SettingsReader::createOsReader(false);
SettingsReader *reader = SettingsReader::createOsReader(false, oclRegPath);
EXPECT_NE(nullptr, reader);
delete reader;
}
TEST(SettingsReader, CreateOsReaderWithRegKey) {
std::string regKey = "Software\\Intel\\OpenCL";
unique_ptr<SettingsReader> reader(SettingsReader::createOsReader(regKey));
std::string regKey = oclRegPath;
unique_ptr<SettingsReader> reader(SettingsReader::createOsReader(false, regKey));
EXPECT_NE(nullptr, reader);
}