Move native cpu device code cts skip to LoadSource. (#17973)

aarongreig · kbenzie · commit e261f6b820cc · 2025-04-16T10:22:34.000+01:00
diff --git a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
@@ -527,7 +527,8 @@ struct urEnqueueKernelLaunchMultiDeviceTest
     auto kernelName =
         uur::KernelsEnvironment::instance->GetEntryPointNames("foo")[0];
 
-    uur::KernelsEnvironment::instance->LoadSource("foo", platform, il_binary);
+    UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+        "foo", platform, il_binary));
 
     UUR_RETURN_ON_FATAL_FAILURE(
         uur::KernelsEnvironment::instance->CreateProgram(
diff --git a/test/conformance/enqueue/urEnqueueKernelLaunchAndMemcpyInOrder.cpp b/test/conformance/enqueue/urEnqueueKernelLaunchAndMemcpyInOrder.cpp
@@ -34,9 +34,6 @@ struct urMultiQueueLaunchMemcpyTest
   using uur::urMultiQueueMultiDeviceTestWithParam<minDevices, T>::queues;
 
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(
         uur::urMultiQueueMultiDeviceTestWithParam<minDevices, T>::SetUp());
 
@@ -49,14 +46,13 @@ struct urMultiQueueLaunchMemcpyTest
     kernels.resize(devices.size());
     SharedMem.resize(devices.size());
 
-    KernelName =
-        uur::KernelsEnvironment::instance->GetEntryPointNames(ProgramName)[0];
-
     std::shared_ptr<std::vector<char>> il_binary;
     std::vector<ur_program_metadata_t> metadatas{};
 
-    uur::KernelsEnvironment::instance->LoadSource(ProgramName, platform,
-                                                  il_binary);
+    UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+        ProgramName, platform, il_binary));
+    KernelName =
+        uur::KernelsEnvironment::instance->GetEntryPointNames(ProgramName)[0];
 
     for (size_t i = 0; i < devices.size(); i++) {
       const ur_program_properties_t properties = {
diff --git a/test/conformance/kernel/urKernelCreate.cpp b/test/conformance/kernel/urKernelCreate.cpp
@@ -66,7 +66,8 @@ TEST_P(urMultiDeviceKernelCreateTest, WithProgramBuild) {
       uur::KernelsEnvironment::instance->GetEntryPointNames("foo")[0];
 
   std::shared_ptr<std::vector<char>> il_binary;
-  uur::KernelsEnvironment::instance->LoadSource("foo", platform, il_binary);
+  UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+      "foo", platform, il_binary));
 
   for (size_t i = 0; i < devices.size(); i++) {
     uur::raii::Program program;
@@ -101,7 +102,8 @@ TEST_P(urMultiDeviceKernelCreateTest, WithProgramCompileAndLink) {
       uur::KernelsEnvironment::instance->GetEntryPointNames("foo")[0];
 
   std::shared_ptr<std::vector<char>> il_binary;
-  uur::KernelsEnvironment::instance->LoadSource("foo", platform, il_binary);
+  UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+      "foo", platform, il_binary));
 
   for (size_t i = 0; i < devices.size(); i++) {
     uur::raii::Program program;
diff --git a/test/conformance/program/urProgramBuild.cpp b/test/conformance/program/urProgramBuild.cpp
@@ -34,8 +34,8 @@ TEST_P(urProgramBuildTest, BuildFailure) {
 
   ur_program_handle_t program = nullptr;
   std::shared_ptr<std::vector<char>> il_binary;
-  uur::KernelsEnvironment::instance->LoadSource("build_failure", platform,
-                                                il_binary);
+  UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+      "build_failure", platform, il_binary));
   if (!il_binary) {
     // The build failure we are testing for happens at SYCL compile time on
     // AMD and Nvidia, so no binary exists to check for a build failure
diff --git a/test/conformance/program/urProgramCreateWithIL.cpp b/test/conformance/program/urProgramCreateWithIL.cpp
@@ -9,9 +9,6 @@
 
 struct urProgramCreateWithILTest : uur::urContextTest {
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(urContextTest::SetUp());
     // TODO: This should use a query for urProgramCreateWithIL support or
     // rely on UR_RESULT_ERROR_UNSUPPORTED_FEATURE being returned.
@@ -22,7 +19,8 @@ struct urProgramCreateWithILTest : uur::urContextTest {
     if (backend == UR_PLATFORM_BACKEND_HIP) {
       GTEST_SKIP();
     }
-    uur::KernelsEnvironment::instance->LoadSource("foo", platform, il_binary);
+    UUR_RETURN_ON_FATAL_FAILURE(uur::KernelsEnvironment::instance->LoadSource(
+        "foo", platform, il_binary));
   }
 
   void TearDown() override {
diff --git a/test/conformance/program/urProgramLink.cpp b/test/conformance/program/urProgramLink.cpp
@@ -82,9 +82,6 @@ struct urProgramLinkErrorTest : uur::urQueueTest {
   const std::string linker_error_program_name = "linker_error";
 
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp());
     // TODO: This should use a query for urProgramCreateWithIL support or
     // rely on UR_RESULT_ERROR_UNSUPPORTED_FEATURE being returned.
diff --git a/test/conformance/source/environment.cpp b/test/conformance/source/environment.cpp
@@ -243,6 +243,9 @@ KernelsEnvironment::getKernelSourcePath(const std::string &kernel_name,
 void KernelsEnvironment::LoadSource(
     const std::string &kernel_name, ur_platform_handle_t platform,
     std::shared_ptr<std::vector<char>> &binary_out) {
+  // We don't have a way to build device code for native cpu yet.
+  UUR_KNOWN_FAILURE_ON_PARAM(platform, uur::NativeCPU{});
+
   std::string source_path =
       instance->getKernelSourcePath(kernel_name, platform);
 
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
@@ -367,9 +367,6 @@ struct urQueueTest : urContextTest {
 
 struct urHostPipeTest : urQueueTest {
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     // The host pipe support query isn't implement on l0
     UUR_KNOWN_FAILURE_ON(uur::LevelZero{}, uur::LevelZeroV2{});
 
@@ -1215,9 +1212,6 @@ std::string deviceTestWithParamPrinter<SamplerCreateParamT>(
 
 struct urProgramTest : urQueueTest {
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp());
 
     ur_platform_backend_t backend;
@@ -1254,9 +1248,6 @@ struct urProgramTest : urQueueTest {
 
 template <class T> struct urProgramTestWithParam : urQueueTestWithParam<T> {
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(urQueueTestWithParam<T>::SetUp());
 
     ur_platform_backend_t backend;
@@ -1303,9 +1294,6 @@ template <class T> struct urProgramTestWithParam : urQueueTestWithParam<T> {
 // instead.
 struct urBaseKernelTest : urProgramTest {
   void SetUp() override {
-    // We haven't got device code tests working on native cpu yet.
-    UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
-
     UUR_RETURN_ON_FATAL_FAILURE(urProgramTest::SetUp());
     auto kernel_names =
         uur::KernelsEnvironment::instance->GetEntryPointNames(program_name);
