Skip to content

Commit 3696d46

Browse files
authored
Merge pull request #1295 from kbenzie/benie/fix-test-adapter-cuda-sizeof
[CUDA] Fix sizeof(const char*) usage
2 parents 9363574 + 58e22d3 commit 3696d46

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

test/adapters/cuda/kernel_tests.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ const char *threeParamsTwoLocal = "\n\
7474
TEST_P(cudaKernelTest, CreateProgramAndKernel) {
7575

7676
uur::raii::Program program = nullptr;
77-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
78-
(const uint8_t *)ptxSource,
79-
nullptr, program.ptr()));
77+
ASSERT_SUCCESS(urProgramCreateWithBinary(
78+
context, device, std::strlen(ptxSource), (const uint8_t *)ptxSource,
79+
nullptr, program.ptr()));
8080
ASSERT_NE(program, nullptr);
8181
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
8282

@@ -116,9 +116,9 @@ TEST_P(cudaKernelTest, CreateProgramAndKernelWithMetadata) {
116116
ur_program_properties_t programProps{UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES,
117117
nullptr, 1, &reqdWorkGroupSizeMDProp};
118118
uur::raii::Program program = nullptr;
119-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
120-
(const uint8_t *)ptxSource,
121-
&programProps, program.ptr()));
119+
ASSERT_SUCCESS(urProgramCreateWithBinary(
120+
context, device, std::strlen(ptxSource), (const uint8_t *)ptxSource,
121+
&programProps, program.ptr()));
122122
ASSERT_NE(program, nullptr);
123123

124124
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
@@ -138,9 +138,9 @@ TEST_P(cudaKernelTest, CreateProgramAndKernelWithMetadata) {
138138

139139
TEST_P(cudaKernelTest, URKernelArgumentSimple) {
140140
uur::raii::Program program = nullptr;
141-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
142-
(const uint8_t *)ptxSource,
143-
nullptr, program.ptr()));
141+
ASSERT_SUCCESS(urProgramCreateWithBinary(
142+
context, device, std::strlen(ptxSource), (const uint8_t *)ptxSource,
143+
nullptr, program.ptr()));
144144
ASSERT_NE(program, nullptr);
145145
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
146146

@@ -160,9 +160,9 @@ TEST_P(cudaKernelTest, URKernelArgumentSimple) {
160160

161161
TEST_P(cudaKernelTest, URKernelArgumentSetTwice) {
162162
uur::raii::Program program = nullptr;
163-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
164-
(const uint8_t *)ptxSource,
165-
nullptr, program.ptr()));
163+
ASSERT_SUCCESS(urProgramCreateWithBinary(
164+
context, device, std::strlen(ptxSource), (const uint8_t *)ptxSource,
165+
nullptr, program.ptr()));
166166
ASSERT_NE(program, nullptr);
167167
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
168168

@@ -189,9 +189,9 @@ TEST_P(cudaKernelTest, URKernelArgumentSetTwice) {
189189

190190
TEST_P(cudaKernelTest, URKernelDispatch) {
191191
uur::raii::Program program = nullptr;
192-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
193-
(const uint8_t *)ptxSource,
194-
nullptr, program.ptr()));
192+
ASSERT_SUCCESS(urProgramCreateWithBinary(
193+
context, device, std::strlen(ptxSource), (const uint8_t *)ptxSource,
194+
nullptr, program.ptr()));
195195
ASSERT_NE(program, nullptr);
196196
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
197197

@@ -218,9 +218,9 @@ TEST_P(cudaKernelTest, URKernelDispatch) {
218218

219219
TEST_P(cudaKernelTest, URKernelDispatchTwo) {
220220
uur::raii::Program program = nullptr;
221-
ASSERT_SUCCESS(urProgramCreateWithBinary(context, device, sizeof(ptxSource),
222-
(const uint8_t *)twoParams,
223-
nullptr, program.ptr()));
221+
ASSERT_SUCCESS(urProgramCreateWithBinary(
222+
context, device, std::strlen(ptxSource), (const uint8_t *)twoParams,
223+
nullptr, program.ptr()));
224224
ASSERT_NE(program, nullptr);
225225
ASSERT_SUCCESS(urProgramBuild(context, program, nullptr));
226226

0 commit comments

Comments
 (0)