Fix additional static analysis issues

Jemale · web-flow · commit f62bdc43d77b · 2024-09-27T19:45:55.000-04:00
Signed-off-by: Jemale Lockett &lt;jemale.lockett@intel.com&gt;
diff --git a/conformance_tests/core/test_copy/src/test_copy_events.cpp b/conformance_tests/core/test_copy/src/test_copy_events.cpp
@@ -28,7 +28,7 @@ class zeCommandListEventTests : public ::testing::Test {
     ep.create_event(hEvent, ZE_EVENT_SCOPE_FLAG_HOST, 0);
   }
 
-  ~zeCommandListEventTests() { ep.destroy_event(hEvent); }
+  void TearDown() override { ep.destroy_event(hEvent); }
 
   ze_event_handle_t hEvent;
   size_t size = 16;
diff --git a/conformance_tests/core/test_copy/src/test_copy_image.cpp b/conformance_tests/core/test_copy/src/test_copy_image.cpp
@@ -61,7 +61,7 @@ class zeCommandListAppendImageCopyTests : public ::testing::Test {
     ze_img_dest = lzt::create_ze_image(img_desc);
   }
 
-  ~zeCommandListAppendImageCopyTests() {
+  void TearDown() override {
     if (!(lzt::image_support())) {
       return;
     }
diff --git a/conformance_tests/core/test_fence/src/test_fence.cpp b/conformance_tests/core/test_fence/src/test_fence.cpp
@@ -56,7 +56,8 @@ class zeFenceTests : public ::testing::Test {
     EXPECT_EQ(ZE_RESULT_SUCCESS, zeFenceCreate(cmd_q_, &descriptor, &fence_));
     EXPECT_NE(nullptr, fence_);
   }
-  ~zeFenceTests() {
+
+  void TearDown() override {
     EXPECT_EQ(ZE_RESULT_SUCCESS, zeFenceDestroy(fence_));
     lzt::destroy_command_queue(cmd_q_);
     lzt::destroy_command_list(cmd_list_);
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_event_helper.cpp b/conformance_tests/core/test_ipc/src/test_ipc_event_helper.cpp
@@ -264,7 +264,8 @@ int main() {
         lzt::get_default_device(lzt::get_default_driver());
     devices.push_back(device);
   }
-  auto context = lzt::create_context_ex(lzt::get_default_driver(), std::move(devices));
+  auto context =
+      lzt::create_context_ex(lzt::get_default_driver(), std::move(devices));
   ze_event_pool_handle_t hEventPool = 0;
   LOG_INFO << "IPC Child open event handle";
   lzt::open_ipc_event_handle(context, hIpcEventPool, &hEventPool);
@@ -311,7 +312,11 @@ int main() {
     lzt::destroy_context(context);
     exit(1);
   }
-  lzt::close_ipc_event_handle(hEventPool);
+  try {
+    lzt::close_ipc_event_handle(hEventPool);
+  } catch (const std::runtime_error &ex) {
+    LOG_ERROR << "Error closing IPC event handle: " << ex.what();
+  }
   lzt::destroy_context(context);
   if (testing::Test::HasFailure()) {
     LOG_DEBUG << "IPC Child Failed GTEST Check";
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_memory.cpp b/conformance_tests/core/test_ipc/src/test_ipc_memory.cpp
@@ -178,5 +178,11 @@ int main(int argc, char **argv) {
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::runtime_error &e) {
+    std::cerr << "Test failed with exception: " << e.what() << std::endl;
+    return 1;
+  }
 }
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_multidevice.cpp b/conformance_tests/core/test_ipc/src/test_ipc_multidevice.cpp
@@ -257,9 +257,20 @@ TEST(
 // zeInit should be handled with fork(), so each process must call
 // zeInit
 int main(int argc, char **argv) {
-  ::testing::InitGoogleMock(&argc, argv);
+  try {
+    ::testing::InitGoogleMock(&argc, argv);
+  } catch (const std::exception &e) {
+    LOG_ERROR << "Failed to init google mock: " << e.what();
+    return 1;
+  }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::runtime_error &e) {
+    std::cerr << "Test failed with exception: " << e.what() << std::endl;
+    return 1;
+  }
 }
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_multisubdevice.cpp b/conformance_tests/core/test_ipc/src/test_ipc_multisubdevice.cpp
@@ -292,9 +292,20 @@ TEST(
 // zeInit should be handled with fork(), so each process must call
 // zeInit
 int main(int argc, char **argv) {
-  ::testing::InitGoogleMock(&argc, argv);
+  try {
+    ::testing::InitGoogleMock(&argc, argv);
+  } catch (std::exception &e) {
+    std::cerr << "Failed to initialize GoogleMock: " << e.what() << std::endl;
+    return 1;
+  }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::runtime_error &e) {
+    std::cerr << "Test failed with exception: " << e.what() << std::endl;
+    return 1;
+  }
 }
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_p2p_memory.cpp b/conformance_tests/core/test_ipc/src/test_ipc_p2p_memory.cpp
@@ -483,5 +483,11 @@ int main(int argc, char **argv) {
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::runtime_error &e) {
+    std::cerr << "Test failed with exception: " << e.what() << std::endl;
+    return 1;
+  }
 }
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_put_handle.cpp b/conformance_tests/core/test_ipc/src/test_ipc_put_handle.cpp
@@ -536,9 +536,20 @@ TEST(
 // zeInit should be handled with fork(), so each process must call
 // zeInit
 int main(int argc, char **argv) {
-  ::testing::InitGoogleMock(&argc, argv);
+  try {
+    ::testing::InitGoogleMock(&argc, argv);
+  } catch (std::exception &e) {
+    std::cerr << "Failed to initialize GoogleMock: " << e.what() << std::endl;
+    return 1;
+  }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::runtime_error &e) {
+    std::cerr << "Test failed with exception: " << e.what() << std::endl;
+    return 1;
+  }
 }
diff --git a/conformance_tests/tools/debug/src/test_debug.cpp b/conformance_tests/tools/debug/src/test_debug.cpp
@@ -1305,10 +1305,13 @@ void zetDebugReadWriteRegistersTest::run_read_write_registers_test(
 
             for (int i = 0; i < buffer_size; i++) {
               if (static_cast<char>(0xaa) != static_cast<char *>(buffer)[i]) {
+                delete[] kernel_buffer;
+                auto found_val = static_cast<char *>(buffer)[i];
+                lzt::free_memory(buffer);
+                lzt::free_memory(buffer_copy);
                 FAIL() << "[Debugger] register set " << regSetNumber
                        << " FAILED write test. Expected "
-                       << static_cast<char>(0xaa) << " , found "
-                       << static_cast<char *>(buffer)[i];
+                       << static_cast<char>(0xaa) << " , found " << found_val;
               }
             }
 
diff --git a/conformance_tests/tools/debug/src/test_debug_helper.cpp b/conformance_tests/tools/debug/src/test_debug_helper.cpp
@@ -1011,7 +1011,14 @@ void multidevice_resource_stress_test(ze_context_handle_t &context,
   ze_command_list_handle_t command_list_1;
   result = zeCommandListCreate(context, device_1, &command_list_desc,
                                &command_list_1);
-  ASSERT_EQ(ZE_RESULT_SUCCESS, result);
+  if (ZE_RESULT_SUCCESS != result) {
+    LOG_ERROR << "[Application] " << __LINE__ << " FAIL: " << result;
+    delete[] validation_buffer_0;
+    delete[] validation_buffer_1;
+    lzt::free_memory(context, values);
+    lzt::free_memory(context, values_1);
+    FAIL();
+  }
   auto fence_1 = lzt::create_fence(command_queue_1);
   auto event_1 = lzt::create_event(event_pool, event_desc);
   lzt::append_memory_copy(command_list_1, values_1, src.data(), size, event_1,
@@ -1081,6 +1088,8 @@ void multidevice_resource_stress_test(ze_context_handle_t &context,
   }
 
   // cleanup
+  delete[] validation_buffer_0;
+  delete[] validation_buffer_1;
   lzt::destroy_function(kernel);
   lzt::destroy_module(module);
   lzt::destroy_fence(fence);
@@ -1108,7 +1117,12 @@ int main(int argc, char **argv) {
   putenv(enable_debug);
 
   debug_options options;
-  options.parse_options(argc, argv);
+  try {
+    options.parse_options(argc, argv);
+  } catch (const boost::bad_any_cast &e) {
+    LOG_ERROR << e.what();
+    exit(1);
+  }
 
   process_synchro synchro(options.enable_synchro, false, options.index_in);
 
diff --git a/conformance_tests/tools/metrics/src/test_metric.cpp b/conformance_tests/tools/metrics/src/test_metric.cpp
@@ -453,7 +453,7 @@ class zetMetricQueryTest : public zetMetricGroupTest {
     EXPECT_NE(nullptr, metricQueryPoolHandle);
     metricQueryHandle = lzt::metric_query_create(metricQueryPoolHandle);
   }
-  ~zetMetricQueryTest() {
+  void TearDown() override {
     lzt::destroy_metric_query(metricQueryHandle);
     lzt::destroy_metric_query_pool(metricQueryPoolHandle);
   }
diff --git a/layer_tests/tracing/src/test_ltracing_ipc_event_helper.cpp b/layer_tests/tracing/src/test_ltracing_ipc_event_helper.cpp
@@ -43,8 +43,13 @@ int main(int argc, char **argv) {
 
   lzt::shared_ipc_event_data_t shared_data;
   bipc::shared_memory_object shm;
-  shm = bipc::shared_memory_object(bipc::open_only, "ipc_ltracing_event_test",
-                                   bipc::read_write);
+  try {
+    shm = bipc::shared_memory_object(bipc::open_only, "ipc_ltracing_event_test",
+                                     bipc::read_write);
+  } catch (bipc::interprocess_exception &ex) {
+    LOG_DEBUG << "Child exit due to shared memory object open failure";
+    exit(EXIT_FAILURE);
+  }
   shm.truncate(sizeof(lzt::shared_ipc_event_data_t));
   bipc::mapped_region region(shm, bipc::read_only);
   std::memcpy(&shared_data, region.get_address(),
diff --git a/negative_tests/core/test_module_errors/src/test_module_errors.cpp b/negative_tests/core/test_module_errors/src/test_module_errors.cpp
@@ -127,7 +127,7 @@ class ModuleNegativeLocalMemoryTests : public ::testing::Test {
     cmd_queue_ = lzt::create_command_queue();
   }
 
-  ~ModuleNegativeLocalMemoryTests() {
+  void TearDown() override {
     lzt::destroy_module(module_);
     lzt::destroy_command_list(cmd_list_);
     lzt::destroy_command_queue(cmd_queue_);
diff --git a/perf_tests/cl_image_copy/src/cl_image_copy.cpp b/perf_tests/cl_image_copy/src/cl_image_copy.cpp
@@ -589,10 +589,15 @@ void measure_latency(ClImageCopyLatency &imageCopyLatency) {
   measure_latency_Device2Host(imageCopyLatency, &ptree_Device2Host);
 
   if (imageCopyLatency.is_json_output_enabled()) {
-    ptree_param_array.push_back(std::make_pair("", ptree_Host2Device));
-    ptree_param_array.push_back(std::make_pair("", ptree_Device2Host));
-    ptree_main.put_child("Performance Benchmark.latency", ptree_param_array);
-    pt::write_json(imageCopyLatency.JsonFileName.c_str(), ptree_main);
+    try {
+      ptree_param_array.push_back(std::make_pair("", ptree_Host2Device));
+      ptree_param_array.push_back(std::make_pair("", ptree_Device2Host));
+      ptree_main.put_child("Performance Benchmark.latency", ptree_param_array);
+      pt::write_json(imageCopyLatency.JsonFileName.c_str(), ptree_main);
+    } catch (const std::exception &e) {
+      std::cerr << "Error outputting latency measurement:" << e.what()
+                << std::endl;
+    }
   }
 }
 
diff --git a/stress_tests/test_misc/src/main.cpp b/stress_tests/test_misc/src/main.cpp
@@ -66,7 +66,12 @@ void reserve_memory(bool release) {
 }
 
 int main(int argc, char **argv) {
-  ::testing::InitGoogleMock(&argc, argv);
+  try {
+    ::testing::InitGoogleMock(&argc, argv);
+  } catch (const std::exception &e) {
+    LOG_ERROR << "Failed to init google mock: " << e.what();
+    return 1;
+  }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
   std::string user_arg = "release_memory";
@@ -84,5 +89,10 @@ int main(int argc, char **argv) {
   LOG_TRACE << "Driver initialized";
   level_zero_tests::print_platform_overview();
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+  } catch (const std::runtime_error &e) {
+    LOG_ERROR << "Failed to run tests: " << e.what();
+    return 1;
+  }
 }
diff --git a/utils/image/test/image_integration_tests.cpp b/utils/image/test/image_integration_tests.cpp
@@ -36,7 +36,10 @@ TEST(ImageIntegrationTests, WritesPNGFile) {
 
   level_zero_tests::ImagePNG32Bit output("output.png");
   EXPECT_EQ(output.get_pixels(), pixels);
-  std::remove("output.png");
+  auto result = std::remove("output.png");
+  if (result != 0) {
+    std::cerr << "Error deleting file output.png" << std::endl;
+  }
 
   EXPECT_EQ(image.get_pixels(), pixels);
 }
@@ -72,7 +75,10 @@ TEST(ImageIntegrationTests, WritesGrayscaleBMPFile) {
 
   level_zero_tests::ImageBMP8Bit output("output.bmp");
   EXPECT_EQ(output.get_pixels(), pixels);
-  std::remove("output.bmp");
+  auto result = std::remove("output.bmp");
+  if (result != 0) {
+    std::cerr << "Error deleting file output.bmp" << std::endl;
+  }
 
   EXPECT_EQ(image.get_pixels(), pixels);
 }
@@ -104,7 +110,10 @@ TEST(ImageIntegrationTests, WritesColorBMPFile) {
 
   level_zero_tests::ImageBMP32Bit output("output.bmp");
   EXPECT_EQ(output.get_pixels(), pixels);
-  std::remove("output.bmp");
+  auto result = std::remove("output.bmp");
+  if (result != 0) {
+    std::cerr << "Error deleting file output.bmp" << std::endl;
+  }
 
   EXPECT_EQ(image.get_pixels(), pixels);
 }
diff --git a/utils/logging/src/logging.cpp b/utils/logging/src/logging.cpp
@@ -63,7 +63,11 @@ void init_logging(const LoggingSettings settings) {
 }
 
 void init_logging(std::vector<std::string> &command_line) {
+  try {
   init_logging(parse_command_line(command_line));
+  } catch (const boost::bad_lexical_cast &e) {
+    std::cerr << "Error initializing logging parsing command line: " << e.what() << std::endl;
+  }
 }
 
 void stop_logging() {
diff --git a/utils/test_harness/src/test_harness_cmdqueue.cpp b/utils/test_harness/src/test_harness_cmdqueue.cpp
@@ -82,7 +82,10 @@ ze_command_queue_handle_t create_command_queue(
 zeCommandQueue::zeCommandQueue() { command_queue_ = create_command_queue(); }
 
 zeCommandQueue::~zeCommandQueue() {
-  EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandQueueDestroy(command_queue_));
+  auto result = zeCommandQueueDestroy(command_queue_);
+  if (result != ZE_RESULT_SUCCESS) {
+    LOG_ERROR << "zeCommandQueueDestroy failed: " << lzt::to_string(result);
+  }
 }
 
 void execute_command_lists(ze_command_queue_handle_t cq,
diff --git a/utils/test_harness/src/test_harness_event.cpp b/utils/test_harness/src/test_harness_event.cpp
@@ -280,7 +280,10 @@ zeEventPool::~zeEventPool() {
   // If the event pool was never created, do not attempt to destroy it
   // as that will needlessly cause a test failure.
   if (event_pool_) {
-    destroy_event_pool(event_pool_);
+    auto result = zeEventPoolDestroy(event_pool_);
+    if (ZE_RESULT_SUCCESS != result) {
+      LOG_ERROR << "Failed to destroy event pool: " << result;
+    }
   }
 }
 
diff --git a/utils/test_harness/src/test_harness_image.cpp b/utils/test_harness/src/test_harness_image.cpp
@@ -134,8 +134,15 @@ zeImageCreateCommon::zeImageCreateCommon()
 }
 
 zeImageCreateCommon::~zeImageCreateCommon() {
-  destroy_ze_image(dflt_device_image_);
-  destroy_ze_image(dflt_device_image_2_);
+
+  auto result = zeImageDestroy(dflt_device_image_);
+  if (result != ZE_RESULT_SUCCESS) {
+    LOG_ERROR << "Failed to destroy image: " << result;
+  }
+  result = zeImageDestroy(dflt_device_image_2_);
+  if (result != ZE_RESULT_SUCCESS) {
+    LOG_ERROR << "Failed to destroy image: " << result;
+  }
 }
 
 void print_image_descriptor_unsupported(const ze_image_desc_t descriptor) {
diff --git a/utils/test_harness/sysman/src/test_harness_sysman_pci.cpp b/utils/test_harness/sysman/src/test_harness_sysman_pci.cpp
@@ -54,7 +54,7 @@ get_pci_bars_extension(zes_device_handle_t device, uint32_t *p_count) {
   std::vector<zes_pci_bar_properties_1_2_t> pciBarExtProps(*p_count);
   for (uint32_t i = 0; i < *p_count; i++) {
     pciBarProps[i].stype = ZES_STRUCTURE_TYPE_PCI_BAR_PROPERTIES;
-    pciBarProps[i].pNext = static_cast<void *>(&pciBarExtProps[i]);
+    pciBarProps[i].pNext = std::move(static_cast<void *>(&pciBarExtProps[i]));
     pciBarExtProps[i].stype = ZES_STRUCTURE_TYPE_PCI_BAR_PROPERTIES_1_2;
     pciBarExtProps[i].pNext = nullptr;
   }
diff --git a/utils/utils/test/main.cpp b/utils/utils/test/main.cpp
diff --git a/utils/utils/test/utils_integration_tests.cpp b/utils/utils/test/utils_integration_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class zeCommandListEventTests : public ::testing::Test {`
`28`	`28`	`ep.create_event(hEvent, ZE_EVENT_SCOPE_FLAG_HOST, 0);`
`29`	`29`	`}`
`30`	`30`
`31`		`- ~zeCommandListEventTests() { ep.destroy_event(hEvent); }`
	`31`	`+ void TearDown() override { ep.destroy_event(hEvent); }`
`32`	`32`
`33`	`33`	`ze_event_handle_t hEvent;`
`34`	`34`	`size_t size = 16;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class zeCommandListAppendImageCopyTests : public ::testing::Test {`
`61`	`61`	`ze_img_dest = lzt::create_ze_image(img_desc);`
`62`	`62`	`}`
`63`	`63`
`64`		`- ~zeCommandListAppendImageCopyTests() {`
	`64`	`+ void TearDown() override {`
`65`	`65`	`if (!(lzt::image_support())) {`
`66`	`66`	`return;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1305,10 +1305,13 @@ void zetDebugReadWriteRegistersTest::run_read_write_registers_test(`
`1305`	`1305`
`1306`	`1306`	`for (int i = 0; i < buffer_size; i++) {`
`1307`	`1307`	`if (static_cast<char>(0xaa) != static_cast<char *>(buffer)[i]) {`
	`1308`	`+ delete[] kernel_buffer;`
	`1309`	`+ auto found_val = static_cast<char *>(buffer)[i];`
	`1310`	`+ lzt::free_memory(buffer);`
	`1311`	`+ lzt::free_memory(buffer_copy);`
`1308`	`1312`	`FAIL() << "[Debugger] register set " << regSetNumber`
`1309`	`1313`	`<< " FAILED write test. Expected "`
`1310`		`- << static_cast<char>(0xaa) << " , found "`
`1311`		`- << static_cast<char *>(buffer)[i];`
	`1314`	`+ << static_cast<char>(0xaa) << " , found " << found_val;`
`1312`	`1315`	`}`
`1313`	`1316`	`}`
`1314`	`1317`