@@ -61,8 +61,8 @@ TEST_P(urEnqueueKernelLaunchTest, DeferredKernelRelease) {
61
61
ASSERT_SUCCESS (urEventRelease (event));
62
62
}
63
63
64
- struct urMultiQueueLaunchKernelDefferFreeTest
65
- : uur::urMultiQueueMultiDeviceTest {
64
+ struct urMultiQueueLaunchKernelDeferFreeTest
65
+ : uur::urMultiQueueMultiDeviceTest< 2 > {
66
66
std::string KernelName;
67
67
68
68
static constexpr char ProgramName[] = " foo" ;
@@ -73,20 +73,21 @@ struct urMultiQueueLaunchKernelDefferFreeTest
73
73
ur_kernel_handle_t kernel = nullptr ;
74
74
75
75
void SetUp () override {
76
- if (uur::KernelsEnvironment::instance-> devices .size () < 2 ) {
76
+ if (devices.size () < 2 ) {
77
77
GTEST_SKIP () << " This test requires at least 2 devices" ;
78
78
}
79
79
80
- UUR_RETURN_ON_FATAL_FAILURE (uur::urMultiQueueMultiDeviceTest::SetUp (
81
- uur::KernelsEnvironment::instance-> devices , 1 ));
80
+ UUR_RETURN_ON_FATAL_FAILURE (
81
+ uur::urMultiQueueMultiDeviceTest< 2 >:: SetUp ( ));
82
82
83
83
KernelName = uur::KernelsEnvironment::instance->GetEntryPointNames (
84
84
ProgramName)[0 ];
85
85
86
86
std::shared_ptr<std::vector<char >> il_binary;
87
87
std::vector<ur_program_metadata_t > metadatas{};
88
88
89
- uur::KernelsEnvironment::instance->LoadSource (ProgramName, il_binary);
89
+ uur::KernelsEnvironment::instance->LoadSource (ProgramName, platform,
90
+ il_binary);
90
91
91
92
const ur_program_properties_t properties = {
92
93
UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES, nullptr ,
@@ -107,11 +108,13 @@ struct urMultiQueueLaunchKernelDefferFreeTest
107
108
108
109
urProgramRelease (program);
109
110
UUR_RETURN_ON_FATAL_FAILURE (
110
- uur::urMultiQueueMultiDeviceTest::TearDown ());
111
+ uur::urMultiQueueMultiDeviceTest< 2 > ::TearDown ());
111
112
}
112
113
};
113
114
114
- TEST_F (urMultiQueueLaunchKernelDefferFreeTest, Success) {
115
+ UUR_INSTANTIATE_PLATFORM_TEST_SUITE_P (urMultiQueueLaunchKernelDeferFreeTest);
116
+
117
+ TEST_P (urMultiQueueLaunchKernelDeferFreeTest, Success) {
115
118
auto zeEvent1 = createZeEvent (context, devices[0 ]);
116
119
auto zeEvent2 = createZeEvent (context, devices[1 ]);
117
120
0 commit comments