@@ -61,8 +61,8 @@ TEST_P(urEnqueueKernelLaunchTest, DeferredKernelRelease) {
6161 ASSERT_SUCCESS (urEventRelease (event));
6262}
6363
64- struct urMultiQueueLaunchKernelDefferFreeTest
65- : uur::urMultiQueueMultiDeviceTest {
64+ struct urMultiQueueLaunchKernelDeferFreeTest
65+ : uur::urMultiQueueMultiDeviceTest< 2 > {
6666 std::string KernelName;
6767
6868 static constexpr char ProgramName[] = " foo" ;
@@ -73,20 +73,21 @@ struct urMultiQueueLaunchKernelDefferFreeTest
7373 ur_kernel_handle_t kernel = nullptr ;
7474
7575 void SetUp () override {
76- if (uur::KernelsEnvironment::instance-> devices .size () < 2 ) {
76+ if (devices.size () < 2 ) {
7777 GTEST_SKIP () << " This test requires at least 2 devices" ;
7878 }
7979
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 ( ));
8282
8383 KernelName = uur::KernelsEnvironment::instance->GetEntryPointNames (
8484 ProgramName)[0 ];
8585
8686 std::shared_ptr<std::vector<char >> il_binary;
8787 std::vector<ur_program_metadata_t > metadatas{};
8888
89- uur::KernelsEnvironment::instance->LoadSource (ProgramName, il_binary);
89+ uur::KernelsEnvironment::instance->LoadSource (ProgramName, platform,
90+ il_binary);
9091
9192 const ur_program_properties_t properties = {
9293 UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES, nullptr ,
@@ -107,11 +108,13 @@ struct urMultiQueueLaunchKernelDefferFreeTest
107108
108109 urProgramRelease (program);
109110 UUR_RETURN_ON_FATAL_FAILURE (
110- uur::urMultiQueueMultiDeviceTest::TearDown ());
111+ uur::urMultiQueueMultiDeviceTest< 2 > ::TearDown ());
111112 }
112113};
113114
114- TEST_F (urMultiQueueLaunchKernelDefferFreeTest, Success) {
115+ UUR_INSTANTIATE_PLATFORM_TEST_SUITE_P (urMultiQueueLaunchKernelDeferFreeTest);
116+
117+ TEST_P (urMultiQueueLaunchKernelDeferFreeTest, Success) {
115118 auto zeEvent1 = createZeEvent (context, devices[0 ]);
116119 auto zeEvent2 = createZeEvent (context, devices[1 ]);
117120
0 commit comments