[UR][NFC] Squish some warnings in testing (#18649)

RossBrunton · web-flow · commit 968c09b860c0 · 2025-05-23T15:41:53.000+01:00
When building UR tests in a dpcpp build (which is disabled by default),
some warnings are flagged, which this patch fixes. Specifically:

* Marking fixture functions as `override` where appropriate.
* Removing casts `const char *` -&gt; `void *`.
diff --git a/unified-runtime/test/conformance/device/urDeviceGet.cpp b/unified-runtime/test/conformance/device/urDeviceGet.cpp
@@ -7,7 +7,7 @@
 #include <uur/fixtures.h>
 
 struct urDeviceGetTest : uur::urPlatformTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(uur::urPlatformTest::SetUp());
 
     // These tests require at least one device in the platform
diff --git a/unified-runtime/test/conformance/device/urDeviceGetSelected.cpp b/unified-runtime/test/conformance/device/urDeviceGetSelected.cpp
@@ -30,7 +30,7 @@ static int unset_env(const char *name) {
 } // namespace uur
 
 struct urDeviceGetSelectedTest : uur::urPlatformTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(uur::urPlatformTest::SetUp());
 
     // These tests require at least one device in the platform
diff --git a/unified-runtime/test/conformance/exp_enqueue_native/enqueue_native_cuda.cpp b/unified-runtime/test/conformance/exp_enqueue_native/enqueue_native_cuda.cpp
@@ -12,7 +12,7 @@
 using T = uint32_t;
 
 struct urCudaEnqueueNativeCommandTest : uur::urQueueTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_KNOWN_FAILURE_ON(uur::LevelZeroV2{});
 
     UUR_RETURN_ON_FATAL_FAILURE(uur::urQueueTest::SetUp());
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgLocal.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgLocal.cpp
@@ -9,7 +9,7 @@
 #include <uur/known_failure.h>
 
 struct urKernelSetArgLocalTest : uur::urKernelTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "mean";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());
   }
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgMemObj.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgMemObj.cpp
@@ -9,14 +9,14 @@
 #include <uur/known_failure.h>
 
 struct urKernelSetArgMemObjTest : uur::urKernelTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "fill";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());
     ASSERT_SUCCESS(urMemBufferCreate(context, UR_MEM_FLAG_READ_WRITE,
                                      16 * sizeof(uint32_t), nullptr, &buffer));
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (buffer) {
       ASSERT_SUCCESS(urMemRelease(buffer));
     }
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgPointer.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgPointer.cpp
@@ -8,12 +8,12 @@
 #include <uur/known_failure.h>
 
 struct urKernelSetArgPointerTest : uur::urKernelExecutionTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "fill_usm";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelExecutionTest::SetUp());
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (allocation) {
       ASSERT_SUCCESS(urUSMFree(context, allocation));
     }
@@ -126,7 +126,7 @@ struct urKernelSetArgPointerNegativeTest : urKernelSetArgPointerTest {
     }
   }
 
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());
     UUR_RETURN_ON_FATAL_FAILURE(SetUpAllocation());
     ASSERT_NE(allocation, nullptr);
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgSampler.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgSampler.cpp
@@ -9,7 +9,7 @@
 
 struct urKernelSetArgSamplerTestWithParam
     : uur::urBaseKernelTestWithParam<uur::SamplerCreateParamT> {
-  void SetUp() {
+  void SetUp() override {
     const auto param = getParam();
     const auto normalized = std::get<0>(param);
     const auto addr_mode = std::get<1>(param);
@@ -45,7 +45,7 @@ struct urKernelSetArgSamplerTestWithParam
         uur::urBaseKernelTestWithParam<uur::SamplerCreateParamT>::Build());
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (sampler) {
       ASSERT_SUCCESS(urSamplerRelease(sampler));
     }
@@ -75,7 +75,7 @@ TEST_P(urKernelSetArgSamplerTestWithParam, Success) {
 }
 
 struct urKernelSetArgSamplerTest : uur::urBaseKernelTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "image_copy";
     UUR_RETURN_ON_FATAL_FAILURE(urBaseKernelTest::SetUp());
 
@@ -104,7 +104,7 @@ struct urKernelSetArgSamplerTest : uur::urBaseKernelTest {
     Build();
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (sampler) {
       ASSERT_SUCCESS(urSamplerRelease(sampler));
     }
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp
@@ -8,7 +8,7 @@
 #include <uur/known_failure.h>
 
 struct urKernelSetArgValueTest : uur::urKernelTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "fill";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());
   }
diff --git a/unified-runtime/test/conformance/kernel/urKernelSetExecInfo.cpp b/unified-runtime/test/conformance/kernel/urKernelSetExecInfo.cpp
@@ -44,12 +44,12 @@ TEST_P(urKernelSetExecInfoTest, InvalidNullPointerPropValue) {
 }
 
 struct urKernelSetExecInfoUSMPointersTest : uur::urKernelTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "fill";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (allocation) {
       ASSERT_SUCCESS(urUSMFree(context, allocation));
     }
diff --git a/unified-runtime/test/conformance/memory-migrate/urMemBufferMigrateAcrossDevices.cpp b/unified-runtime/test/conformance/memory-migrate/urMemBufferMigrateAcrossDevices.cpp
@@ -12,7 +12,7 @@
 using T = uint32_t;
 
 struct urMultiDeviceContextTest : uur::urPlatformTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(uur::urPlatformTest::SetUp());
     ASSERT_SUCCESS(
         urDeviceGet(platform, UR_DEVICE_TYPE_ALL, 0, nullptr, &num_devices));
@@ -32,7 +32,7 @@ struct urMultiDeviceContextTest : uur::urPlatformTest {
     }
   }
 
-  void TearDown() {
+  void TearDown() override {
     uur::urPlatformTest::TearDown();
     if (num_devices <= 1) {
       return;
@@ -51,7 +51,7 @@ struct urMultiDeviceContextTest : uur::urPlatformTest {
 };
 
 struct urMultiDeviceContextMemBufferTest : urMultiDeviceContextTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(urMultiDeviceContextTest::SetUp());
     if (num_devices <= 1) {
       return;
@@ -121,7 +121,7 @@ struct urMultiDeviceContextMemBufferTest : urMultiDeviceContextTest {
     }
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (num_devices > 1) {
       for (auto i = 0u; i < num_devices; ++i) {
         ASSERT_SUCCESS(urKernelRelease(kernels[i]));
diff --git a/unified-runtime/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp b/unified-runtime/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp
@@ -66,7 +66,7 @@ std::vector<ur_image_format_t> all_image_formats;
 
 struct urMemImageCreateTestWithImageFormatParam
     : uur::urContextTestWithParam<ur_image_format_t> {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(
         uur::urContextTestWithParam<ur_image_format_t>::SetUp());
     bool image_support = false;
@@ -75,7 +75,7 @@ struct urMemImageCreateTestWithImageFormatParam
       GTEST_SKIP() << "Device doesn't support images";
     }
   }
-  void TearDown() {
+  void TearDown() override {
     UUR_RETURN_ON_FATAL_FAILURE(
         uur::urContextTestWithParam<ur_image_format_t>::TearDown());
   }
diff --git a/unified-runtime/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp b/unified-runtime/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp
@@ -8,7 +8,9 @@
 #include <uur/known_failure.h>
 
 struct urMemImageCreateWithNativeHandleTest : uur::urMemImageTest {
-  void SetUp() { UUR_RETURN_ON_FATAL_FAILURE(urMemImageTest::SetUp()); }
+  void SetUp() override {
+    UUR_RETURN_ON_FATAL_FAILURE(urMemImageTest::SetUp());
+  }
 };
 UUR_INSTANTIATE_DEVICE_TEST_SUITE(urMemImageCreateWithNativeHandleTest);
 
diff --git a/unified-runtime/test/conformance/queue/urQueueGetInfo.cpp b/unified-runtime/test/conformance/queue/urQueueGetInfo.cpp
@@ -220,7 +220,7 @@ TEST_P(urQueueGetInfoTest, InvalidNullPointerPropSizeRet) {
 }
 
 struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});
     UUR_RETURN_ON_FATAL_FAILURE(urQueueGetInfoTest::SetUp());
     ur_queue_flags_t deviceQueueCapabilities = 0;
@@ -233,7 +233,7 @@ struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {
     ASSERT_SUCCESS(urQueueCreate(context, device, &queueProperties, &queue));
   }
 
-  void TearDown() {
+  void TearDown() override {
     if (queue) {
       ASSERT_SUCCESS(urQueueRelease(queue));
     }
diff --git a/unified-runtime/test/conformance/testing/include/uur/fixtures.h b/unified-runtime/test/conformance/testing/include/uur/fixtures.h
@@ -1618,14 +1618,14 @@ struct urBaseKernelExecutionTest : urBaseKernelTest {
 
 template <class T>
 struct urKernelExecutionTestWithParam : urBaseKernelExecutionTestWithParam<T> {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(urBaseKernelExecutionTestWithParam<T>::SetUp());
     this->Build();
   }
 };
 
 struct urKernelExecutionTest : urBaseKernelExecutionTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(urBaseKernelExecutionTest::SetUp());
     Build();
   }
@@ -1647,7 +1647,7 @@ template <typename Derived> struct urGlobalVariableBaseTest : public Derived {
     // they rely on metadata set when creating the program.
     const std::string metadata_name = "_Z7dev_var@global_id_mapping";
     ur_program_metadata_value_t metadata_value;
-    metadata_value.pData = (void *)metadataData.c_str();
+    metadata_value.pData = (void *)metadataData.data();
     this->metadatas.push_back({metadata_name.c_str(),
                                UR_PROGRAM_METADATA_TYPE_BYTE_ARRAY,
                                metadataData.size(), metadata_value});
diff --git a/unified-runtime/test/conformance/usm/urUSMFree.cpp b/unified-runtime/test/conformance/usm/urUSMFree.cpp
@@ -107,7 +107,7 @@ TEST_P(urUSMFreeTest, InvalidNullPtrMem) {
 // This goal of this test is to ensure urUSMFree blocks and waits for operations
 // accessing the given allocation to finish before actually freeing the memory.
 struct urUSMFreeDuringExecutionTest : uur::urKernelExecutionTest {
-  void SetUp() {
+  void SetUp() override {
     program_name = "fill_usm";
     UUR_RETURN_ON_FATAL_FAILURE(urKernelExecutionTest::SetUp());
   }
diff --git a/unified-runtime/test/conformance/usm/urUSMPoolCreate.cpp b/unified-runtime/test/conformance/usm/urUSMPoolCreate.cpp
@@ -9,7 +9,7 @@
 #include <uur/known_failure.h>
 
 struct urUSMPoolCreateTest : uur::urContextTest {
-  void SetUp() {
+  void SetUp() override {
     UUR_RETURN_ON_FATAL_FAILURE(uur::urContextTest::SetUp());
     ur_bool_t poolSupport = false;
     ASSERT_SUCCESS(uur::GetDeviceUSMPoolSupport(device, poolSupport));
diff --git a/unified-runtime/test/unit/print.h b/unified-runtime/test/unit/print.h
@@ -210,12 +210,13 @@ struct UrDeviceGetInfoParamsEmpty : UrDeviceGetInfoParams {
 };
 
 struct UrDeviceGetInfoParamsName : UrDeviceGetInfoParams {
-  const char *name = "FOOBAR";
   UrDeviceGetInfoParamsName() : UrDeviceGetInfoParams() {
+    static std::string name{"FOOBAR"};
+
     propName = UR_DEVICE_INFO_NAME;
-    pPropValue = (void *)name;
-    propSize = strlen(name) + 1;
-    propSizeRet = strlen(name) + 1;
+    pPropValue = (void *)name.data();
+    propSize = name.length() + 1;
+    propSizeRet = name.length() + 1;
   }
   const char *get_expected() {
     return ".hDevice = nullptr, .propName = UR_DEVICE_INFO_NAME, .propSize "

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#include <uur/known_failure.h>`
`10`	`10`
`11`	`11`	`struct urKernelSetArgLocalTest : uur::urKernelTest {`
`12`		`- void SetUp() {`
	`12`	`+ void SetUp() override {`
`13`	`13`	`program_name = "mean";`
`14`	`14`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@`
`8`	`8`	`#include <uur/known_failure.h>`
`9`	`9`
`10`	`10`	`struct urKernelSetArgPointerTest : uur::urKernelExecutionTest {`
`11`		`- void SetUp() {`
	`11`	`+ void SetUp() override {`
`12`	`12`	`program_name = "fill_usm";`
`13`	`13`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelExecutionTest::SetUp());`
`14`	`14`	`}`
`15`	`15`
`16`		`- void TearDown() {`
	`16`	`+ void TearDown() override {`
`17`	`17`	`if (allocation) {`
`18`	`18`	`ASSERT_SUCCESS(urUSMFree(context, allocation));`
`19`	`19`	`}`
`@@ -126,7 +126,7 @@ struct urKernelSetArgPointerNegativeTest : urKernelSetArgPointerTest {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`- void SetUp() {`
	`129`	`+ void SetUp() override {`
`130`	`130`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());`
`131`	`131`	`UUR_RETURN_ON_FATAL_FAILURE(SetUpAllocation());`
`132`	`132`	`ASSERT_NE(allocation, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include <uur/known_failure.h>`
`9`	`9`
`10`	`10`	`struct urKernelSetArgValueTest : uur::urKernelTest {`
`11`		`- void SetUp() {`
	`11`	`+ void SetUp() override {`
`12`	`12`	`program_name = "fill";`
`13`	`13`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ TEST_P(urKernelSetExecInfoTest, InvalidNullPointerPropValue) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`struct urKernelSetExecInfoUSMPointersTest : uur::urKernelTest {`
`47`		`- void SetUp() {`
	`47`	`+ void SetUp() override {`
`48`	`48`	`program_name = "fill";`
`49`	`49`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelTest::SetUp());`
`50`	`50`	`}`
`51`	`51`
`52`		`- void TearDown() {`
	`52`	`+ void TearDown() override {`
`53`	`53`	`if (allocation) {`
`54`	`54`	`ASSERT_SUCCESS(urUSMFree(context, allocation));`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ std::vector<ur_image_format_t> all_image_formats;`
`66`	`66`
`67`	`67`	`struct urMemImageCreateTestWithImageFormatParam`
`68`	`68`	`: uur::urContextTestWithParam<ur_image_format_t> {`
`69`		`- void SetUp() {`
	`69`	`+ void SetUp() override {`
`70`	`70`	`UUR_RETURN_ON_FATAL_FAILURE(`
`71`	`71`	`uur::urContextTestWithParam<ur_image_format_t>::SetUp());`
`72`	`72`	`bool image_support = false;`
`@@ -75,7 +75,7 @@ struct urMemImageCreateTestWithImageFormatParam`
`75`	`75`	`GTEST_SKIP() << "Device doesn't support images";`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- void TearDown() {`
	`78`	`+ void TearDown() override {`
`79`	`79`	`UUR_RETURN_ON_FATAL_FAILURE(`
`80`	`80`	`uur::urContextTestWithParam<ur_image_format_t>::TearDown());`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ TEST_P(urQueueGetInfoTest, InvalidNullPointerPropSizeRet) {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {`
`223`		`- void SetUp() {`
	`223`	`+ void SetUp() override {`
`224`	`224`	`UUR_KNOWN_FAILURE_ON(uur::NativeCPU{});`
`225`	`225`	`UUR_RETURN_ON_FATAL_FAILURE(urQueueGetInfoTest::SetUp());`
`226`	`226`	`ur_queue_flags_t deviceQueueCapabilities = 0;`
`@@ -233,7 +233,7 @@ struct urQueueGetInfoDeviceQueueTestWithInfoParam : public uur::urQueueTest {`
`233`	`233`	`ASSERT_SUCCESS(urQueueCreate(context, device, &queueProperties, &queue));`
`234`	`234`	`}`
`235`	`235`
`236`		`- void TearDown() {`
	`236`	`+ void TearDown() override {`
`237`	`237`	`if (queue) {`
`238`	`238`	`ASSERT_SUCCESS(urQueueRelease(queue));`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ TEST_P(urUSMFreeTest, InvalidNullPtrMem) {`
`107`	`107`	`// This goal of this test is to ensure urUSMFree blocks and waits for operations`
`108`	`108`	`// accessing the given allocation to finish before actually freeing the memory.`
`109`	`109`	`struct urUSMFreeDuringExecutionTest : uur::urKernelExecutionTest {`
`110`		`- void SetUp() {`
	`110`	`+ void SetUp() override {`
`111`	`111`	`program_name = "fill_usm";`
`112`	`112`	`UUR_RETURN_ON_FATAL_FAILURE(urKernelExecutionTest::SetUp());`
`113`	`113`	`}`