Skip to content

Commit 18c7d27

Browse files
committed
Fix some match files and fix level zero handling of the query.
Also add simple optional query handling to urProgramGetInfo cts test.
1 parent e42415e commit 18c7d27

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

source/adapters/level_zero/program.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ ur_result_t urProgramBuildExp(
223223
hProgram->ZeBuildLogMap.insert(std::make_pair(ZeDevice, ZeBuildLog));
224224
}
225225

226-
// We no longer need the IL / native code.
227-
hProgram->Code.reset();
228226
if (!hProgram->ZeModuleMap.empty())
229227
hProgram->ZeModule = hProgram->ZeModuleMap.begin()->second;
230228
if (!hProgram->ZeBuildLogMap.empty())
@@ -817,7 +815,7 @@ ur_result_t urProgramGetInfo(
817815
return UR_RESULT_ERROR_UNKNOWN;
818816
}
819817
case UR_PROGRAM_INFO_IL:
820-
return ReturnValue(Program->Code.get());
818+
return ReturnValue(Program->Code.get(), Program->CodeLength);
821819
default:
822820
return UR_RESULT_ERROR_INVALID_ENUMERATION;
823821
}

test/conformance/program/program_adapter_native_cpu.match

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_CONTEXT
5858
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_NUM_DEVICES
5959
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_DEVICES
60-
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_SOURCE
60+
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_IL
6161
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_BINARY_SIZES
6262
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_BINARIES
6363
{{OPT}}urProgramGetInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__UR_PROGRAM_INFO_NUM_KERNELS
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
urProgramCreateWithILTest.BuildInvalidProgram/Intel_R__OpenCL___{{.*}}_
2-
urProgramGetFunctionPointerTest.InvalidFunctionName/Intel_R__OpenCL___{{.*}}_
3-
urProgramGetInfoTest.Success/Intel_R__OpenCL___{{.*}}___UR_PROGRAM_INFO_BINARIES

test/conformance/program/urProgramGetInfo.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@ TEST_P(urProgramGetInfoTest, Success) {
5252
sizeof(binaries[0]), binaries,
5353
nullptr));
5454
} else {
55-
ASSERT_SUCCESS(urProgramGetInfo(program, property_name, 0, nullptr,
56-
&property_size));
55+
auto result = urProgramGetInfo(program, property_name, 0, nullptr,
56+
&property_size);
57+
if (result != UR_RESULT_SUCCESS) {
58+
ASSERT_EQ_RESULT(result, UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION);
59+
return;
60+
}
5761
property_value.resize(property_size);
5862
ASSERT_SUCCESS(urProgramGetInfo(program, property_name, property_size,
5963
property_value.data(), nullptr));

0 commit comments

Comments
 (0)