Skip to content

Commit cd702af

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Fix windows wrappers
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent cfad41f commit cd702af

File tree

8 files changed

+165
-182
lines changed

8 files changed

+165
-182
lines changed

‎opencl/test/unit_test/os_interface/windows/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ set(IGDRCL_SRCS_tests_os_interface_windows
3737
${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_allocate_in_device_pool_tests.inl
3838
${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller_tests.cpp
3939
${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_handler_tests.cpp
40-
${CMAKE_CURRENT_SOURCE_DIR}/mock_registry_reader.cpp
4140
${CMAKE_CURRENT_SOURCE_DIR}/mock_sys_calls.h
4241
)
4342

‎opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp‎

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

‎opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp‎

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@
77

88
#include "opencl/test/unit_test/os_interface/windows/registry_reader_tests.h"
99

10+
#include "shared/source/os_interface/windows/sys_calls.h"
1011
#include "shared/test/common/helpers/variable_backup.h"
1112

1213
#include "test.h"
1314

14-
using namespace NEO;
15+
namespace NEO {
1516

1617
using RegistryReaderTest = ::testing::Test;
1718

19+
namespace SysCalls {
1820
extern uint32_t regOpenKeySuccessCount;
1921
extern uint32_t regQueryValueSuccessCount;
2022
extern uint64_t regQueryValueExpectedData;
23+
} // namespace SysCalls
2124

2225
TEST_F(RegistryReaderTest, givenRegistryReaderWhenItIsCreatedWithUserScopeSetToFalseThenItsHkeyTypeIsInitializedToHkeyLocalMachine) {
2326
bool userScope = false;
@@ -69,89 +72,89 @@ TEST_F(RegistryReaderTest, givenRegistryReaderWhenEnvironmentIntVariableExistsTh
6972
}
7073

7174
struct DebugReaderWithRegistryAndEnvTest : ::testing::Test {
72-
VariableBackup<uint32_t> openRegCountBackup{&regOpenKeySuccessCount};
73-
VariableBackup<uint32_t> queryRegCountBackup{&regQueryValueSuccessCount};
75+
VariableBackup<uint32_t> openRegCountBackup{&SysCalls::regOpenKeySuccessCount};
76+
VariableBackup<uint32_t> queryRegCountBackup{&SysCalls::regQueryValueSuccessCount};
7477
TestedRegistryReader registryReader{""};
7578
};
7679

7780
TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {
78-
regOpenKeySuccessCount = 1u;
79-
regQueryValueSuccessCount = 1u;
81+
SysCalls::regOpenKeySuccessCount = 1u;
82+
SysCalls::regQueryValueSuccessCount = 1u;
8083

8184
EXPECT_EQ(1, registryReader.getSetting("settingSourceInt", 0));
8285
}
8386

8487
TEST_F(DebugReaderWithRegistryAndEnvTest, givenInt64DebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {
85-
regOpenKeySuccessCount = 1u;
86-
regQueryValueSuccessCount = 1u;
88+
SysCalls::regOpenKeySuccessCount = 1u;
89+
SysCalls::regQueryValueSuccessCount = 1u;
8790

8891
EXPECT_EQ(0xffffffffeeeeeeee, registryReader.getSetting("settingSourceInt64", 0));
8992
}
9093

9194
TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenQueryValueFailsThenObtainValueFromEnv) {
92-
regOpenKeySuccessCount = 1u;
93-
regQueryValueSuccessCount = 0u;
95+
SysCalls::regOpenKeySuccessCount = 1u;
96+
SysCalls::regQueryValueSuccessCount = 0u;
9497

9598
EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0));
9699
}
97100

98101
TEST_F(DebugReaderWithRegistryAndEnvTest, givenIntDebugKeyWhenOpenKeyFailsThenObtainValueFromEnv) {
99-
regOpenKeySuccessCount = 0u;
100-
regQueryValueSuccessCount = 0u;
102+
SysCalls::regOpenKeySuccessCount = 0u;
103+
SysCalls::regQueryValueSuccessCount = 0u;
101104

102105
EXPECT_EQ(2, registryReader.getSetting("settingSourceInt", 0));
103106
}
104107

105108
TEST_F(DebugReaderWithRegistryAndEnvTest, givenStringDebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {
106109
std::string defaultValue("default");
107-
regOpenKeySuccessCount = 1u;
108-
regQueryValueSuccessCount = 2u;
110+
SysCalls::regOpenKeySuccessCount = 1u;
111+
SysCalls::regQueryValueSuccessCount = 2u;
109112

110113
EXPECT_STREQ("registry", registryReader.getSetting("settingSourceString", defaultValue).c_str());
111114
}
112115

113116
TEST_F(DebugReaderWithRegistryAndEnvTest, givenStringDebugKeyWhenQueryValueFailsThenObtainValueFromEnv) {
114117
std::string defaultValue("default");
115-
regOpenKeySuccessCount = 1u;
116-
regQueryValueSuccessCount = 0u;
118+
SysCalls::regOpenKeySuccessCount = 1u;
119+
SysCalls::regQueryValueSuccessCount = 0u;
117120

118121
EXPECT_STREQ("environment", registryReader.getSetting("settingSourceString", defaultValue).c_str());
119122

120-
regOpenKeySuccessCount = 1u;
121-
regQueryValueSuccessCount = 1u;
123+
SysCalls::regOpenKeySuccessCount = 1u;
124+
SysCalls::regQueryValueSuccessCount = 1u;
122125

123126
EXPECT_STREQ("environment", registryReader.getSetting("settingSourceString", defaultValue).c_str());
124127
}
125128

126129
TEST_F(DebugReaderWithRegistryAndEnvTest, givenStringDebugKeyWhenOpenKeyFailsThenObtainValueFromEnv) {
127130
std::string defaultValue("default");
128-
regOpenKeySuccessCount = 0u;
129-
regQueryValueSuccessCount = 0u;
131+
SysCalls::regOpenKeySuccessCount = 0u;
132+
SysCalls::regQueryValueSuccessCount = 0u;
130133

131134
EXPECT_STREQ("environment", registryReader.getSetting("settingSourceString", defaultValue).c_str());
132135
}
133136

134137
TEST_F(DebugReaderWithRegistryAndEnvTest, givenBinaryDebugKeyWhenReadFromRegistrySucceedsThenReturnObtainedValue) {
135138
std::string defaultValue("default");
136-
regOpenKeySuccessCount = 1u;
137-
regQueryValueSuccessCount = 2u;
139+
SysCalls::regOpenKeySuccessCount = 1u;
140+
SysCalls::regQueryValueSuccessCount = 2u;
138141

139142
EXPECT_STREQ("registry", registryReader.getSetting("settingSourceBinary", defaultValue).c_str());
140143
}
141144
TEST_F(DebugReaderWithRegistryAndEnvTest, givenBinaryDebugKeyOnlyInRegistryWhenReadFromRegistryFailsThenReturnDefaultValue) {
142145
std::string defaultValue("default");
143-
regOpenKeySuccessCount = 1u;
144-
regQueryValueSuccessCount = 1u;
146+
SysCalls::regOpenKeySuccessCount = 1u;
147+
SysCalls::regQueryValueSuccessCount = 1u;
145148

146149
EXPECT_STREQ("default", registryReader.getSetting("settingSourceBinary", defaultValue).c_str());
147150

148-
regOpenKeySuccessCount = 1u;
149-
regQueryValueSuccessCount = 0u;
151+
SysCalls::regOpenKeySuccessCount = 1u;
152+
SysCalls::regQueryValueSuccessCount = 0u;
150153

151154
EXPECT_STREQ("default", registryReader.getSetting("settingSourceBinary", defaultValue).c_str());
152155

153-
regOpenKeySuccessCount = 0u;
154-
regQueryValueSuccessCount = 0u;
156+
SysCalls::regOpenKeySuccessCount = 0u;
157+
SysCalls::regQueryValueSuccessCount = 0u;
155158

156159
EXPECT_STREQ("default", registryReader.getSetting("settingSourceBinary", defaultValue).c_str());
157160
}
@@ -161,9 +164,9 @@ TEST_F(RegistryReaderTest, givenRegistryKeyPresentWhenValueIsZeroThenExpectBoole
161164
std::string keyName = "boolRegistryKey";
162165

163166
bool defaultValue = false;
164-
regOpenKeySuccessCount = 1;
165-
regQueryValueSuccessCount = 1;
166-
regQueryValueExpectedData = 0ull;
167+
SysCalls::regOpenKeySuccessCount = 1;
168+
SysCalls::regQueryValueSuccessCount = 1;
169+
SysCalls::regQueryValueExpectedData = 0ull;
167170

168171
TestedRegistryReader registryReader(regKey);
169172
bool value = registryReader.getSetting(keyName.c_str(), defaultValue);
@@ -175,18 +178,18 @@ TEST_F(RegistryReaderTest, givenRegistryKeyNotPresentWhenDefaulValueIsFalseOrTru
175178
std::string keyName = "boolRegistryKey";
176179

177180
bool defaultValue = false;
178-
regOpenKeySuccessCount = 1;
179-
regQueryValueSuccessCount = 0;
180-
regQueryValueExpectedData = 1ull;
181+
SysCalls::regOpenKeySuccessCount = 1;
182+
SysCalls::regQueryValueSuccessCount = 0;
183+
SysCalls::regQueryValueExpectedData = 1ull;
181184

182185
TestedRegistryReader registryReader(regKey);
183186
bool value = registryReader.getSetting(keyName.c_str(), defaultValue);
184187
EXPECT_FALSE(value);
185188

186189
defaultValue = true;
187-
regOpenKeySuccessCount = 1;
188-
regQueryValueSuccessCount = 0;
189-
regQueryValueExpectedData = 0ull;
190+
SysCalls::regOpenKeySuccessCount = 1;
191+
SysCalls::regQueryValueSuccessCount = 0;
192+
SysCalls::regQueryValueExpectedData = 0ull;
190193

191194
value = registryReader.getSetting(keyName.c_str(), defaultValue);
192195
EXPECT_TRUE(value);
@@ -197,9 +200,9 @@ TEST_F(RegistryReaderTest, givenRegistryKeyPresentWhenValueIsNonZeroInHigherDwor
197200
std::string keyName = "boolRegistryKey";
198201

199202
bool defaultValue = true;
200-
regOpenKeySuccessCount = 1;
201-
regQueryValueSuccessCount = 1;
202-
regQueryValueExpectedData = 1ull << 32;
203+
SysCalls::regOpenKeySuccessCount = 1;
204+
SysCalls::regQueryValueSuccessCount = 1;
205+
SysCalls::regQueryValueExpectedData = 1ull << 32;
203206

204207
TestedRegistryReader registryReader(regKey);
205208
bool value = registryReader.getSetting(keyName.c_str(), defaultValue);
@@ -211,9 +214,9 @@ TEST_F(RegistryReaderTest, givenRegistryKeyPresentWhenValueIsNonZeroInLowerDword
211214
std::string keyName = "boolRegistryKey";
212215

213216
bool defaultValue = false;
214-
regOpenKeySuccessCount = 1;
215-
regQueryValueSuccessCount = 1;
216-
regQueryValueExpectedData = 1ull;
217+
SysCalls::regOpenKeySuccessCount = 1;
218+
SysCalls::regQueryValueSuccessCount = 1;
219+
SysCalls::regQueryValueExpectedData = 1ull;
217220

218221
TestedRegistryReader registryReader(regKey);
219222
bool value = registryReader.getSetting(keyName.c_str(), defaultValue);
@@ -225,20 +228,21 @@ TEST_F(RegistryReaderTest, givenRegistryKeyPresentWhenValueIsNonZeroInBothDwords
225228
std::string keyName = "boolRegistryKey";
226229

227230
bool defaultValue = false;
228-
regOpenKeySuccessCount = 1;
229-
regQueryValueSuccessCount = 1;
230-
regQueryValueExpectedData = 1ull | (1ull << 32);
231+
SysCalls::regOpenKeySuccessCount = 1;
232+
SysCalls::regQueryValueSuccessCount = 1;
233+
SysCalls::regQueryValueExpectedData = 1ull | (1ull << 32);
231234

232235
TestedRegistryReader registryReader(regKey);
233236
bool value = registryReader.getSetting(keyName.c_str(), defaultValue);
234237
EXPECT_TRUE(value);
235238
}
236239

237240
TEST_F(DebugReaderWithRegistryAndEnvTest, givenSetProcessNameWhenReadFromEnvironmentVariableThenReturnClCacheDir) {
238-
regOpenKeySuccessCount = 0u;
239-
regQueryValueSuccessCount = 0u;
241+
SysCalls::regOpenKeySuccessCount = 0u;
242+
SysCalls::regQueryValueSuccessCount = 0u;
240243
registryReader.processName = "processName";
241244
std::string defaultCacheDir = "";
242245
std::string cacheDir = registryReader.getSetting("processName", defaultCacheDir);
243246
EXPECT_STREQ("./tested_cl_cache_dir", cacheDir.c_str());
244247
}
248+
} // namespace NEO

0 commit comments

Comments
 (0)