Skip to content

Commit 1195f71

Browse files
omarahmed1111omarahmed1111
authored
Merge pull request #1487 from omarahmed1111/Add-more-CTS-coverage-for-urKernelSetArgSampler
[CTS] Add more CTS coverage for urKernelSetArgSampler
2 parents a6cdcf4 + 2475d4f commit 1195f71

File tree

6 files changed

+152
-52
lines changed

6 files changed

+152
-52
lines changed

‎test/conformance/kernel/kernel_adapter_native_cpu.match

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,27 @@ urKernelSetArgPointerTest.SuccessDevice/SYCL_NATIVE_CPU___SYCL_Native_CPU_
114114
urKernelSetArgPointerTest.SuccessShared/SYCL_NATIVE_CPU___SYCL_Native_CPU_
115115
urKernelSetArgPointerNegativeTest.InvalidNullHandleKernel/SYCL_NATIVE_CPU___SYCL_Native_CPU_
116116
urKernelSetArgPointerNegativeTest.InvalidKernelArgumentIndex/SYCL_NATIVE_CPU___SYCL_Native_CPU_
117-
urKernelSetArgSamplerTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
117+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
118+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
119+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
120+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
121+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
122+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
123+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
124+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
125+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
126+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
127+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
128+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
129+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
130+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
131+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
132+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
133+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
134+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
135+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
136+
urKernelSetArgSamplerTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
137+
urKernelSetArgSamplerTest.SuccessWithProps/SYCL_NATIVE_CPU___SYCL_Native_CPU_
118138
urKernelSetArgSamplerTest.InvalidNullHandleKernel/SYCL_NATIVE_CPU___SYCL_Native_CPU_
119139
urKernelSetArgSamplerTest.InvalidNullHandleArgValue/SYCL_NATIVE_CPU___SYCL_Native_CPU_
120140
urKernelSetArgSamplerTest.InvalidKernelArgumentIndex/SYCL_NATIVE_CPU___SYCL_Native_CPU_

‎test/conformance/kernel/urKernelSetArgSampler.cpp

Lines changed: 59 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,63 @@
55

66
#include <uur/fixtures.h>
77

8+
struct urKernelSetArgSamplerTestWithParam
9+
: uur::urBaseKernelTestWithParam<uur::SamplerCreateParamT> {
10+
void SetUp() {
11+
program_name = "image_copy";
12+
UUR_RETURN_ON_FATAL_FAILURE(
13+
uur::urBaseKernelTestWithParam<uur::SamplerCreateParamT>::SetUp());
14+
UUR_RETURN_ON_FATAL_FAILURE(
15+
uur::urBaseKernelTestWithParam<uur::SamplerCreateParamT>::Build());
16+
17+
const auto param = getParam();
18+
const auto normalized = std::get<0>(param);
19+
const auto addr_mode = std::get<1>(param);
20+
const auto filter_mode = std::get<2>(param);
21+
22+
ur_sampler_desc_t sampler_desc = {
23+
UR_STRUCTURE_TYPE_SAMPLER_DESC, /* sType */
24+
nullptr, /* pNext */
25+
normalized, /* normalizedCoords */
26+
addr_mode, /* addressingMode */
27+
filter_mode /* filterMode */
28+
};
29+
ASSERT_SUCCESS(urSamplerCreate(context, &sampler_desc, &sampler));
30+
}
31+
32+
void TearDown() {
33+
if (sampler) {
34+
ASSERT_SUCCESS(urSamplerRelease(sampler));
35+
}
36+
UUR_RETURN_ON_FATAL_FAILURE(uur::urBaseKernelTestWithParam<
37+
uur::SamplerCreateParamT>::TearDown());
38+
}
39+
40+
ur_sampler_handle_t sampler = nullptr;
41+
};
42+
43+
UUR_TEST_SUITE_P(
44+
urKernelSetArgSamplerTestWithParam,
45+
::testing::Combine(
46+
::testing::Values(true, false),
47+
::testing::Values(UR_SAMPLER_ADDRESSING_MODE_NONE,
48+
UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE,
49+
UR_SAMPLER_ADDRESSING_MODE_CLAMP,
50+
UR_SAMPLER_ADDRESSING_MODE_REPEAT,
51+
UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT),
52+
::testing::Values(UR_SAMPLER_FILTER_MODE_NEAREST,
53+
UR_SAMPLER_FILTER_MODE_LINEAR)),
54+
uur::deviceTestWithParamPrinter<uur::SamplerCreateParamT>);
55+
56+
TEST_P(urKernelSetArgSamplerTestWithParam, Success) {
57+
uint32_t arg_index = 2;
58+
ASSERT_SUCCESS(urKernelSetArgSampler(kernel, arg_index, nullptr, sampler));
59+
}
60+
861
struct urKernelSetArgSamplerTest : uur::urBaseKernelTest {
962
void SetUp() {
1063
program_name = "image_copy";
1164
UUR_RETURN_ON_FATAL_FAILURE(urBaseKernelTest::SetUp());
12-
// Images and samplers are not available on AMD
13-
ur_platform_backend_t backend;
14-
ASSERT_SUCCESS(urPlatformGetInfo(platform, UR_PLATFORM_INFO_BACKEND,
15-
sizeof(backend), &backend, nullptr));
16-
if (backend == UR_PLATFORM_BACKEND_HIP) {
17-
GTEST_SKIP() << "Sampler are not supported on hip.";
18-
}
1965
Build();
2066
ur_sampler_desc_t sampler_desc = {
2167
UR_STRUCTURE_TYPE_SAMPLER_DESC, /* sType */
@@ -36,10 +82,14 @@ struct urKernelSetArgSamplerTest : uur::urBaseKernelTest {
3682

3783
ur_sampler_handle_t sampler = nullptr;
3884
};
85+
3986
UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgSamplerTest);
4087

41-
TEST_P(urKernelSetArgSamplerTest, Success) {
42-
ASSERT_SUCCESS(urKernelSetArgSampler(kernel, 2, nullptr, sampler));
88+
TEST_P(urKernelSetArgSamplerTest, SuccessWithProps) {
89+
ur_kernel_arg_sampler_properties_t props{
90+
UR_STRUCTURE_TYPE_KERNEL_ARG_SAMPLER_PROPERTIES, nullptr};
91+
size_t arg_index = 2;
92+
ASSERT_SUCCESS(urKernelSetArgSampler(kernel, arg_index, &props, sampler));
4393
}
4494

4595
TEST_P(urKernelSetArgSamplerTest, InvalidNullHandleKernel) {

‎test/conformance/sampler/sampler_adapter_native_cpu.match

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
2-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
3-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
4-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
5-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
6-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
7-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
8-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
9-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
10-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___1_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
11-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
12-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
13-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
14-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
15-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
16-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
17-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
18-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
19-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
20-
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___0_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
1+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
2+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
3+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
4+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
5+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
6+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
7+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
8+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
9+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
10+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___NORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
11+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_NEAREST
12+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_NONE_UR_SAMPLER_FILTER_MODE_LINEAR
13+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_NEAREST
14+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE_UR_SAMPLER_FILTER_MODE_LINEAR
15+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_NEAREST
16+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_CLAMP_UR_SAMPLER_FILTER_MODE_LINEAR
17+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
18+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
19+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_NEAREST
20+
urSamplerCreateTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UNNORMALIZED_UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT_UR_SAMPLER_FILTER_MODE_LINEAR
2121
urSamplerCreateWithNativeHandleTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
2222
urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_SAMPLER_INFO_REFERENCE_COUNT
2323
urSamplerGetInfoTestWithParam.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_SAMPLER_INFO_CONTEXT

‎test/conformance/sampler/urSamplerCreate.cpp

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,9 @@
66
#include "uur/fixtures.h"
77
#include "uur/raii.h"
88

9-
using SamplerCreateParamTy =
10-
std::tuple<bool, ur_sampler_addressing_mode_t, ur_sampler_filter_mode_t>;
11-
129
struct urSamplerCreateTestWithParam
13-
: uur::urContextTestWithParam<SamplerCreateParamTy> {};
14-
15-
namespace uur {
16-
template <>
17-
std::string deviceTestWithParamPrinter(
18-
const ::testing::TestParamInfo<
19-
std::tuple<ur_device_handle_t, SamplerCreateParamTy>> &info) {
20-
auto device = std::get<0>(info.param);
21-
auto param = std::get<1>(info.param);
10+
: uur::urContextTestWithParam<uur::SamplerCreateParamT> {};
2211

23-
const auto normalized = std::get<0>(param);
24-
const auto addr_mode = std::get<1>(param);
25-
const auto filter_mode = std::get<2>(param);
26-
27-
std::stringstream ss;
28-
ss << normalized << "_" << addr_mode << "_" << filter_mode;
29-
return uur::GetPlatformAndDeviceName(device) + "__" + ss.str();
30-
}
31-
} // namespace uur
3212
UUR_TEST_SUITE_P(
3313
urSamplerCreateTestWithParam,
3414
::testing::Combine(
@@ -40,7 +20,7 @@ UUR_TEST_SUITE_P(
4020
UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT),
4121
::testing::Values(UR_SAMPLER_FILTER_MODE_NEAREST,
4222
UR_SAMPLER_FILTER_MODE_LINEAR)),
43-
uur::deviceTestWithParamPrinter<SamplerCreateParamTy>);
23+
uur::deviceTestWithParamPrinter<uur::SamplerCreateParamT>);
4424

4525
TEST_P(urSamplerCreateTestWithParam, Success) {
4626

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,9 +1100,26 @@ std::string deviceTestWithParamPrinter<BoolTestParam>(
11001100
const ::testing::TestParamInfo<
11011101
std::tuple<ur_device_handle_t, BoolTestParam>> &info);
11021102

1103+
using SamplerCreateParamT =
1104+
std::tuple<bool, ur_sampler_addressing_mode_t, ur_sampler_filter_mode_t>;
1105+
1106+
template <>
1107+
std::string deviceTestWithParamPrinter<SamplerCreateParamT>(
1108+
const ::testing::TestParamInfo<
1109+
std::tuple<ur_device_handle_t, SamplerCreateParamT>> &info);
1110+
11031111
struct urProgramTest : urQueueTest {
11041112
void SetUp() override {
11051113
UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp());
1114+
1115+
ur_platform_backend_t backend;
1116+
ASSERT_SUCCESS(urPlatformGetInfo(platform, UR_PLATFORM_INFO_BACKEND,
1117+
sizeof(backend), &backend, nullptr));
1118+
// Images and samplers are not available on AMD
1119+
if (program_name == "image_copy" &&
1120+
backend == UR_PLATFORM_BACKEND_HIP) {
1121+
GTEST_SKIP();
1122+
}
11061123
UUR_RETURN_ON_FATAL_FAILURE(
11071124
uur::KernelsEnvironment::instance->LoadSource(program_name, 0,
11081125
il_binary));
@@ -1131,6 +1148,17 @@ struct urProgramTest : urQueueTest {
11311148
template <class T> struct urProgramTestWithParam : urContextTestWithParam<T> {
11321149
void SetUp() override {
11331150
UUR_RETURN_ON_FATAL_FAILURE(urContextTestWithParam<T>::SetUp());
1151+
1152+
ur_platform_backend_t backend;
1153+
ASSERT_SUCCESS(urPlatformGetInfo(this->platform,
1154+
UR_PLATFORM_INFO_BACKEND,
1155+
sizeof(backend), &backend, nullptr));
1156+
// Images and samplers are not available on AMD
1157+
if (program_name == "image_copy" &&
1158+
backend == UR_PLATFORM_BACKEND_HIP) {
1159+
GTEST_SKIP();
1160+
}
1161+
11341162
UUR_RETURN_ON_FATAL_FAILURE(
11351163
uur::KernelsEnvironment::instance->LoadSource(program_name, 0,
11361164
il_binary));

‎test/conformance/testing/source/fixtures.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,26 @@ std::string deviceTestWithParamPrinter<BoolTestParam>(
1717
ss << param.name << (param.value ? "Enabled" : "Disabled");
1818
return uur::GetPlatformAndDeviceName(device) + "__" + ss.str();
1919
}
20+
21+
template <>
22+
std::string deviceTestWithParamPrinter<SamplerCreateParamT>(
23+
const ::testing::TestParamInfo<
24+
std::tuple<ur_device_handle_t, uur::SamplerCreateParamT>> &info) {
25+
auto device = std::get<0>(info.param);
26+
auto param = std::get<1>(info.param);
27+
28+
const auto normalized = std::get<0>(param);
29+
const auto addr_mode = std::get<1>(param);
30+
const auto filter_mode = std::get<2>(param);
31+
32+
std::stringstream ss;
33+
34+
if (normalized) {
35+
ss << "NORMALIZED_";
36+
} else {
37+
ss << "UNNORMALIZED_";
38+
}
39+
ss << addr_mode << "_" << filter_mode;
40+
return uur::GetPlatformAndDeviceName(device) + "__" + ss.str();
41+
}
2042
} // namespace uur

0 commit comments

Comments
 (0)