Skip to content

Commit aba560b

Browse files
committed
fix libsyclinterface tests
1 parent 0a68078 commit aba560b

5 files changed

Lines changed: 30 additions & 18 deletions

libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ struct TestDPCTLSyclKernelBundleInterface
6969
spirvFile.seekg(0, std::ios::beg);
7070
spirvFile.read(spirvBuffer.data(), spirvFileSize);
7171
KBRef = DPCTLKernelBundle_CreateFromSpirv(
72-
CRef, DRef, spirvBuffer.data(), spirvFileSize, nullptr);
72+
CRef, DRef, spirvBuffer.data(), spirvFileSize, nullptr, 0,
73+
nullptr);
7374
}
7475
}
7576

@@ -132,18 +133,21 @@ TEST_P(TestDPCTLSyclKernelBundleInterface, ChkCreateFromSpirvNull)
132133
const void *null_spirv = nullptr;
133134
DPCTLSyclKernelBundleRef KBRef = nullptr;
134135
// Null context
135-
EXPECT_NO_FATAL_FAILURE(KBRef = DPCTLKernelBundle_CreateFromSpirv(
136-
Null_CRef, Null_DRef, null_spirv, 0, nullptr));
136+
EXPECT_NO_FATAL_FAILURE(
137+
KBRef = DPCTLKernelBundle_CreateFromSpirv(
138+
Null_CRef, Null_DRef, null_spirv, 0, nullptr, 0, nullptr));
137139
ASSERT_TRUE(KBRef == nullptr);
138140

139141
// Null device
140-
EXPECT_NO_FATAL_FAILURE(KBRef = DPCTLKernelBundle_CreateFromSpirv(
141-
CRef, Null_DRef, null_spirv, 0, nullptr));
142+
EXPECT_NO_FATAL_FAILURE(
143+
KBRef = DPCTLKernelBundle_CreateFromSpirv(CRef, Null_DRef, null_spirv,
144+
0, nullptr, 0, nullptr));
142145
ASSERT_TRUE(KBRef == nullptr);
143146

144147
// Null IL
145-
EXPECT_NO_FATAL_FAILURE(KBRef = DPCTLKernelBundle_CreateFromSpirv(
146-
CRef, DRef, null_spirv, 0, nullptr));
148+
EXPECT_NO_FATAL_FAILURE(
149+
KBRef = DPCTLKernelBundle_CreateFromSpirv(CRef, DRef, null_spirv, 0,
150+
nullptr, 0, nullptr));
147151
ASSERT_TRUE(KBRef == nullptr);
148152
}
149153

@@ -350,8 +354,8 @@ TEST_F(TestKernelBundleUnsupportedBackend, CheckCreateFromSpirv)
350354
spirvFile.close();
351355

352356
DPCTLSyclKernelBundleRef KBRef = nullptr;
353-
EXPECT_NO_FATAL_FAILURE(
354-
KBRef = DPCTLKernelBundle_CreateFromSpirv(
355-
CRef, DRef, spirvBuffer.data(), spirvFileSize, nullptr));
357+
EXPECT_NO_FATAL_FAILURE(KBRef = DPCTLKernelBundle_CreateFromSpirv(
358+
CRef, DRef, spirvBuffer.data(), spirvFileSize,
359+
nullptr, 0, nullptr));
356360
ASSERT_TRUE(KBRef == nullptr);
357361
}

libsyclinterface/tests/test_sycl_queue_submit.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ struct TestQueueSubmit : public ::testing::Test
242242
auto CRef = DPCTLQueue_GetContext(QRef);
243243

244244
KBRef = DPCTLKernelBundle_CreateFromSpirv(
245-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
245+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
246+
nullptr);
246247
DPCTLDevice_Delete(DRef);
247248
DPCTLDeviceSelector_Delete(DSRef);
248249
}
@@ -282,7 +283,8 @@ struct TestQueueSubmitFP64 : public ::testing::Test
282283
auto CRef = DPCTLQueue_GetContext(QRef);
283284

284285
KBRef = DPCTLKernelBundle_CreateFromSpirv(
285-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
286+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
287+
nullptr);
286288
DPCTLDeviceSelector_Delete(DSRef);
287289
}
288290

libsyclinterface/tests/test_sycl_queue_submit_local_accessor_arg.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ struct TestQueueSubmitWithLocalAccessor : public ::testing::Test
237237
auto CRef = DPCTLQueue_GetContext(QRef);
238238

239239
KBRef = DPCTLKernelBundle_CreateFromSpirv(
240-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
240+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
241+
nullptr);
241242
DPCTLDevice_Delete(DRef);
242243
DPCTLDeviceSelector_Delete(DSRef);
243244
}
@@ -276,7 +277,8 @@ struct TestQueueSubmitWithLocalAccessorFP64 : public ::testing::Test
276277
auto CRef = DPCTLQueue_GetContext(QRef);
277278

278279
KBRef = DPCTLKernelBundle_CreateFromSpirv(
279-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
280+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
281+
nullptr);
280282
DPCTLDeviceSelector_Delete(DSRef);
281283
}
282284

libsyclinterface/tests/test_sycl_queue_submit_raw_kernel_arg.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ struct TestQueueSubmitWithRawKernelArg : public ::testing::Test
262262
auto CRef = DPCTLQueue_GetContext(QRef);
263263

264264
KBRef = DPCTLKernelBundle_CreateFromSpirv(
265-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
265+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
266+
nullptr);
266267
DPCTLDevice_Delete(DRef);
267268
DPCTLDeviceSelector_Delete(DSRef);
268269
}
@@ -301,7 +302,8 @@ struct TestQueueSubmitWithRawKernelArgFP64 : public ::testing::Test
301302
auto CRef = DPCTLQueue_GetContext(QRef);
302303

303304
KBRef = DPCTLKernelBundle_CreateFromSpirv(
304-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
305+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
306+
nullptr);
305307
DPCTLDeviceSelector_Delete(DSRef);
306308
}
307309

libsyclinterface/tests/test_sycl_queue_submit_work_group_memory_arg.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ struct TestQueueSubmitWithWorkGroupMemory : public ::testing::Test
262262
auto CRef = DPCTLQueue_GetContext(QRef);
263263

264264
KBRef = DPCTLKernelBundle_CreateFromSpirv(
265-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
265+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
266+
nullptr);
266267
DPCTLDevice_Delete(DRef);
267268
DPCTLDeviceSelector_Delete(DSRef);
268269
}
@@ -301,7 +302,8 @@ struct TestQueueSubmitWithWorkGroupMemoryFP64 : public ::testing::Test
301302
auto CRef = DPCTLQueue_GetContext(QRef);
302303

303304
KBRef = DPCTLKernelBundle_CreateFromSpirv(
304-
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr);
305+
CRef, DRef, spirvBuffer_.data(), spirvFileSize_, nullptr, 0,
306+
nullptr);
305307
DPCTLDeviceSelector_Delete(DSRef);
306308
}
307309

0 commit comments

Comments
 (0)