Skip to content

Commit ea58e4d

Browse files
aarongreigaarongreig
committed
Fix formatting + build.
1 parent cd82b31 commit ea58e4d

File tree

9 files changed

+44
-26
lines changed

9 files changed

+44
-26
lines changed

‎test/conformance/device/urDeviceGetInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ TEST_P(urDeviceGetInfoTest, Success) {
317317
}
318318

319319
std::vector<char> info_data(size);
320-
ASSERT_SUCCESS(urDeviceGetInfo(device, info_type, size,
321-
info_data.data(), nullptr));
320+
ASSERT_SUCCESS(
321+
urDeviceGetInfo(device, info_type, size, info_data.data(), nullptr));
322322

323323
if (info_type == UR_DEVICE_INFO_PLATFORM) {
324324
auto returned_platform =

‎test/conformance/exp_command_buffer/fixtures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#include <array>
1010

11-
#include <uur/known_failure.h>
1211
#include <uur/fixtures.h>
12+
#include <uur/known_failure.h>
1313

1414
namespace uur {
1515
namespace command_buffer {

‎test/conformance/platform/urPlatformGetInfo.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ UUR_PLATFORM_TEST_SUITE_P(
2121
TEST_P(urPlatformGetInfoTest, Success) {
2222
size_t size = 0;
2323
ur_platform_info_t info_type = getParam();
24-
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(urPlatformGetInfo(platform, info_type, 0, nullptr, &size), info_type);
24+
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
25+
urPlatformGetInfo(platform, info_type, 0, nullptr, &size), info_type);
2526
if (info_type == UR_PLATFORM_INFO_BACKEND) {
2627
ASSERT_EQ(size, sizeof(ur_platform_backend_t));
2728
} else {
@@ -47,8 +48,11 @@ TEST_P(urPlatformGetInfoTest, Success) {
4748
auto queried_adapter =
4849
*reinterpret_cast<ur_adapter_handle_t *>(name.data());
4950
auto adapter_found =
50-
std::find(adapters.begin(), adapters.end(), queried_adapter);
51-
ASSERT_NE(adapter_found, adapters.end());
51+
std::find(uur::PlatformEnvironment::instance->adapters.begin(),
52+
uur::PlatformEnvironment::instance->adapters.end(),
53+
queried_adapter);
54+
ASSERT_NE(adapter_found,
55+
uur::AdapterEnvironment::instance->adapters.end());
5256
break;
5357
}
5458
default:

‎test/conformance/source/environment.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,15 @@ constexpr std::pair<const char *, ur_platform_backend_t> backends[] = {
8080
};
8181

8282
namespace {
83+
/* unused due to platform filtering being commented out
8384
constexpr const char *backend_to_str(ur_platform_backend_t backend) {
8485
for (auto b : backends) {
8586
if (b.second == backend) {
8687
return b.first;
8788
}
8889
}
8990
return "INVALID";
90-
};
91+
};*/
9192

9293
ur_platform_backend_t str_to_backend(std::string str) {
9394

‎test/conformance/testing/include/uur/known_failure.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ inline bool isKnownFailureOn(const DeviceTuple &param,
124124
if (matcher.backend != adapterInfo.backend) {
125125
continue;
126126
}
127-
if(matcher.adapterVersion != adapterInfo.version) {
127+
if (matcher.adapterVersion != adapterInfo.version) {
128128
continue;
129129
}
130130
if (matcher.names.empty()) {

‎test/conformance/virtual_memory/urPhysicalMemCreate.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ struct urPhysicalMemCreateTest
2727
};
2828

2929
using urPhysicalMemCreateWithSizeParamTest = urPhysicalMemCreateTest;
30-
UUR_TEST_SUITE_P(urPhysicalMemCreateWithSizeParamTest,
31-
::testing::Values(1, 2, 3, 7, 12, 44),
32-
uur::deviceTestWithParamPrinter<size_t>);
30+
UUR_DEVICE_TEST_SUITE_P(urPhysicalMemCreateWithSizeParamTest,
31+
::testing::Values(1, 2, 3, 7, 12, 44),
32+
uur::deviceTestWithParamPrinter<size_t>);
3333

3434
TEST_P(urPhysicalMemCreateWithSizeParamTest, Success) {
3535
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
@@ -40,6 +40,8 @@ TEST_P(urPhysicalMemCreateWithSizeParamTest, Success) {
4040
}
4141

4242
TEST_P(urPhysicalMemCreateWithSizeParamTest, InvalidSize) {
43+
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
44+
4345
if (granularity == 1) {
4446
GTEST_SKIP()
4547
<< "A granularity of 1 means that any size will be accepted.";
@@ -52,9 +54,10 @@ TEST_P(urPhysicalMemCreateWithSizeParamTest, InvalidSize) {
5254

5355
using urPhysicalMemCreateWithFlagsParamTest =
5456
uur::urPhysicalMemTestWithParam<ur_physical_mem_flags_t>;
55-
UUR_TEST_SUITE_P(urPhysicalMemCreateWithFlagsParamTest,
56-
::testing::Values(UR_PHYSICAL_MEM_FLAG_TBD),
57-
uur::deviceTestWithParamPrinter<ur_physical_mem_flags_t>);
57+
UUR_DEVICE_TEST_SUITE_P(
58+
urPhysicalMemCreateWithFlagsParamTest,
59+
::testing::Values(UR_PHYSICAL_MEM_FLAG_TBD),
60+
uur::deviceTestWithParamPrinter<ur_physical_mem_flags_t>);
5861

5962
TEST_P(urPhysicalMemCreateWithFlagsParamTest, Success) {
6063
ur_physical_mem_properties_t properties;
@@ -68,8 +71,8 @@ TEST_P(urPhysicalMemCreateWithFlagsParamTest, Success) {
6871
}
6972

7073
using urPhysicalMemCreateTest = urPhysicalMemCreateTest;
71-
UUR_TEST_SUITE_P(urPhysicalMemCreateTest, ::testing::Values(1),
72-
uur::deviceTestWithParamPrinter<size_t>);
74+
UUR_DEVICE_TEST_SUITE_P(urPhysicalMemCreateTest, ::testing::Values(1),
75+
uur::deviceTestWithParamPrinter<size_t>);
7376

7477
TEST_P(urPhysicalMemCreateTest, InvalidNullHandleContext) {
7578
ASSERT_EQ_RESULT(

‎test/conformance/virtual_memory/urPhysicalMemGetInfo.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
// See LICENSE.TXT
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55
#include <uur/fixtures.h>
6+
#include <uur/known_failure.h>
67

78
using urPhysicalMemGetInfoTest = uur::urPhysicalMemTest;
89
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urPhysicalMemGetInfoTest);
910

1011
TEST_P(urPhysicalMemGetInfoTest, Context) {
12+
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
13+
1114
size_t info_size = 0;
1215

1316
ASSERT_SUCCESS(urPhysicalMemGetInfo(
@@ -25,6 +28,8 @@ TEST_P(urPhysicalMemGetInfoTest, Context) {
2528
}
2629

2730
TEST_P(urPhysicalMemGetInfoTest, Device) {
31+
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
32+
2833
size_t info_size = 0;
2934

3035
ASSERT_SUCCESS(urPhysicalMemGetInfo(
@@ -41,6 +46,8 @@ TEST_P(urPhysicalMemGetInfoTest, Device) {
4146
}
4247

4348
TEST_P(urPhysicalMemGetInfoTest, Size) {
49+
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
50+
4451
size_t info_size = 0;
4552

4653
ASSERT_SUCCESS(urPhysicalMemGetInfo(physical_mem, UR_PHYSICAL_MEM_INFO_SIZE,
@@ -56,6 +63,7 @@ TEST_P(urPhysicalMemGetInfoTest, Size) {
5663
}
5764

5865
TEST_P(urPhysicalMemGetInfoTest, Properties) {
66+
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
5967
size_t info_size = 0;
6068

6169
ASSERT_SUCCESS(urPhysicalMemGetInfo(

‎test/conformance/virtual_memory/urVirtualMemMap.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
using urVirtualMemMapWithFlagsTest =
88
uur::urVirtualMemTestWithParam<ur_virtual_mem_access_flag_t>;
9-
UUR_TEST_SUITE_P(urVirtualMemMapWithFlagsTest,
10-
::testing::Values(UR_VIRTUAL_MEM_ACCESS_FLAG_NONE,
11-
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE,
12-
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_ONLY),
13-
uur::deviceTestWithParamPrinter<ur_virtual_mem_access_flag_t>);
9+
UUR_DEVICE_TEST_SUITE_P(
10+
urVirtualMemMapWithFlagsTest,
11+
::testing::Values(UR_VIRTUAL_MEM_ACCESS_FLAG_NONE,
12+
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE,
13+
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_ONLY),
14+
uur::deviceTestWithParamPrinter<ur_virtual_mem_access_flag_t>);
1415

1516
TEST_P(urVirtualMemMapWithFlagsTest, Success) {
1617
ASSERT_SUCCESS(urVirtualMemMap(context, virtual_ptr, size, physical_mem, 0,

‎test/conformance/virtual_memory/urVirtualMemSetAccess.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
using urVirtualMemSetAccessWithFlagsTest =
88
uur::urVirtualMemMappedTestWithParam<ur_virtual_mem_access_flag_t>;
9-
UUR_TEST_SUITE_P(urVirtualMemSetAccessWithFlagsTest,
10-
::testing::Values(UR_VIRTUAL_MEM_ACCESS_FLAG_NONE,
11-
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE,
12-
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_ONLY),
13-
uur::deviceTestWithParamPrinter<ur_virtual_mem_access_flag_t>);
9+
UUR_DEVICE_TEST_SUITE_P(
10+
urVirtualMemSetAccessWithFlagsTest,
11+
::testing::Values(UR_VIRTUAL_MEM_ACCESS_FLAG_NONE,
12+
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE,
13+
UR_VIRTUAL_MEM_ACCESS_FLAG_READ_ONLY),
14+
uur::deviceTestWithParamPrinter<ur_virtual_mem_access_flag_t>);
1415

1516
TEST_P(urVirtualMemSetAccessWithFlagsTest, Success) {
1617
ASSERT_SUCCESS(

0 commit comments

Comments
 (0)